diff options
author | Yang Tse <yangsita@gmail.com> | 2011-10-11 19:41:30 +0200 |
---|---|---|
committer | Yang Tse <yangsita@gmail.com> | 2011-10-11 19:41:30 +0200 |
commit | 584dc8b8af862f7f47a3a9f02f874ac0bd0076be (patch) | |
tree | 5e5ff41b3862251704b8f46f36bcf9052ad48e52 /lib/multi.c | |
parent | a84b8a39224d0c668d80fed561bc89b4144edbb4 (diff) |
OOM handling/cleanup slight adjustments
Diffstat (limited to 'lib/multi.c')
-rw-r--r-- | lib/multi.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/multi.c b/lib/multi.c index 7786ccced..8a8779c23 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -425,12 +425,13 @@ CURLM *curl_multi_init(void) return (CURLM *) multi; error: - if(multi->sockhash) - Curl_hash_destroy(multi->sockhash); - if(multi->hostcache) - Curl_hash_destroy(multi->hostcache); - if(multi->connc) - Curl_rm_connc(multi->connc); + + Curl_hash_destroy(multi->sockhash); + multi->sockhash = NULL; + Curl_hash_destroy(multi->hostcache); + multi->hostcache = NULL; + Curl_rm_connc(multi->connc); + multi->connc = NULL; free(multi); return NULL; @@ -1801,6 +1802,7 @@ CURLMcode curl_multi_cleanup(CURLM *multi_handle) } Curl_rm_connc(multi->connc); + multi->connc = NULL; /* remove the pending list of messages */ Curl_llist_destroy(multi->msglist, NULL); |