moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-17 23:15:08 -05:00
Code Issues Releases Wiki Activity

strerror: fix null deref on winapi out-of-memory

Browse Source 
Follow-up to bed5f84 from several days ago.

Ref: https://github.com/curl/curl/pull/6005
This commit is contained in:
Jay Satiro 2020-10-01 13:34:59 -04:00
parent 7920be9473
commit 9a13f7c2a7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/strerror.c
View File

@ -670,11 +670,13 @@ get_winapi_error(int err, char *buf, size_t buflen)
FORMAT_MESSAGE_IGNORE_INSERTS), NULL, err, FORMAT_MESSAGE_IGNORE_INSERTS), NULL, err,
LANG_NEUTRAL, wbuf, sizeof(wbuf)/sizeof(TCHAR), NULL)) { LANG_NEUTRAL, wbuf, sizeof(wbuf)/sizeof(TCHAR), NULL)) {
char *msg = curlx_convert_tchar_to_UTF8(wbuf); char *msg = curlx_convert_tchar_to_UTF8(wbuf);
if(msg) {
strncpy(buf, msg, buflen - 1); strncpy(buf, msg, buflen - 1);
buf[buflen-1] = '\0'; buf[buflen-1] = '\0';
curlx_unicodefree(msg); curlx_unicodefree(msg);
} }
} }
}
/* Truncate multiple lines */ /* Truncate multiple lines */
p = strchr(buf, '\n'); p = strchr(buf, '\n');