generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

multi.c: OOM handling fix

Browse Source 
Fix curl_multi_cleanup() segfault when using weird cleanup sequence.
This commit is contained in:
Yang Tse 2011-10-27 17:08:02 +02:00
parent b0d42da26b
commit ddeab48245
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/multi.c
View File

@ -1775,10 +1775,6 @@ CURLMcode curl_multi_cleanup(CURLM *multi_handle)
if(GOOD_MULTI_HANDLE(multi)) { if(GOOD_MULTI_HANDLE(multi)) {
multi->type = 0; /* not good anymore */ multi->type = 0; /* not good anymore */
Curl_hash_destroy(multi->hostcache);
Curl_hash_destroy(multi->sockhash);
multi->hostcache = NULL;
multi->sockhash = NULL;
/* go over all connections that have close actions */ /* go over all connections that have close actions */
for(i=0; i< multi->connc->num; i++) { for(i=0; i< multi->connc->num; i++) {
@ -1802,6 +1798,12 @@ CURLMcode curl_multi_cleanup(CURLM *multi_handle)
cl= n; cl= n;
} }
Curl_hash_destroy(multi->hostcache);
multi->hostcache = NULL;
Curl_hash_destroy(multi->sockhash);
multi->sockhash = NULL;
Curl_rm_connc(multi->connc); Curl_rm_connc(multi->connc);
multi->connc = NULL; multi->connc = NULL;