From: Yang Tse <yangsita@gmail.com>
Date: Thu, 6 Oct 2011 18:30:34 +0000 (+0200)
Subject: multi.c: OOM handling fixes making torture tests 560 580 581 pass
X-Git-Tag: curl-7_23_0~92
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b82bd05354cfa756a013d2bed4ffdc951ce903db;p=thirdparty%2Fcurl.git

multi.c: OOM handling fixes making torture tests 560 580 581 pass
---

diff --git a/lib/multi.c b/lib/multi.c
index bf1f46764b..0f7a24993f 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -1041,7 +1041,9 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
         /* Add this handle to the send or pend pipeline */
         easy->result = addHandleToSendOrPendPipeline(data,
                                                      easy->easy_conn);
-        if(CURLE_OK == easy->result) {
+        if(CURLE_OK != easy->result)
+          disconnect_conn = TRUE;
+        else {
           if(async)
             /* We're now waiting for an asynchronous name lookup */
             multistate(easy, CURLM_STATE_WAITRESOLVE);
@@ -1539,8 +1541,10 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
             newurl = data->req.location;
             data->req.location = NULL;
             easy->result = Curl_follow(data, newurl, FOLLOW_FAKE);
-            if(easy->result)
+            if(easy->result) {
+              disconnect_conn = TRUE;
               free(newurl);
+            }
           }
 
           multistate(easy, CURLM_STATE_DONE);