moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-23 16:48:49 -05:00
Code Issues Releases Wiki Activity

OS400: handle memory error in list conversion

Browse Source 
Curl_slist_append_nodup() returns NULL when it fails to create a new
item for the specified list, and since the coding here reassigned the
new list on top of the old list it would result in a dangling pointer
and lost memory. Also, in case we hit an allocation failure at some
point during the conversion, with allocation succeeding again on the
subsequent call(s) we will return a truncated list around the malloc
failure point. Fix by assigning to a temporary list pointer, which can
be checked (which is the common pattern for slist appending), and free
all the resources on allocation failure.

Closes #3372
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
This commit is contained in:
Daniel Gustafsson 2018-12-13 10:15:00 +01:00
parent 7a09b52c98
commit a58b27740f
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/OS400/ccsidcurl.c
View File

@ -219,13 +219,20 @@ slist_convert(int dccsid, struct curl_slist * from, int sccsid)
struct curl_slist * to = (struct curl_slist *) NULL; struct curl_slist * to = (struct curl_slist *) NULL;
for(; from; from = from->next) { for(; from; from = from->next) {
struct curl_slist *nl;
char * cp = dynconvert(dccsid, from->data, -1, sccsid); char * cp = dynconvert(dccsid, from->data, -1, sccsid);
if(!cp) { if(!cp) {
curl_slist_free_all(to); curl_slist_free_all(to);
return (struct curl_slist *) NULL; return (struct curl_slist *) NULL;
} }
to = Curl_slist_append_nodup(to, cp); nl = Curl_slist_append_nodup(to, cp);
if(!nl) {
curl_slist_free_all(to);
free(cp);
return NULL;
}
to = nl;
} }
return to; return to;
} }