From 5d4c981e130adac09fc13bc04494f5f56294cc79 Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Thu, 30 Aug 2007 18:26:19 +0000 Subject: Fixed a few compiler warnings. Try to do a slightly better job of cleaning up after an OOM condition in curl_multi_add_handle --- lib/multi.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/multi.c b/lib/multi.c index 42294eeb6..b2e513043 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -511,7 +511,7 @@ CURLMcode curl_multi_add_handle(CURLM *multi_handle, /* We want the connection cache to have plenty room. Before we supported the shared cache every single easy handle had 5 entries in their cache by default. */ - int newmax = multi->num_easy * 4; + long newmax = multi->num_easy * 4; if(multi->maxconnects && (multi->maxconnects < newmax)) /* don't grow beyond the allowed size */ @@ -520,9 +520,11 @@ CURLMcode curl_multi_add_handle(CURLM *multi_handle, if(newmax > multi->connc->num) { /* we only do this is we can in fact grow the cache */ CURLcode res = Curl_ch_connc(easy_handle, multi->connc, newmax); - if(res != CURLE_OK) - /* TODO: we need to do some cleaning up here! */ - return CURLM_OUT_OF_MEMORY; + if(res != CURLE_OK) { + /* FIXME: may need to do more cleanup here */ + curl_multi_remove_handle(multi_handle, easy_handle); + return res; + } } } -- cgit v1.2.3