43 lines
1.2 KiB
Diff
43 lines
1.2 KiB
Diff
|
From 2dfc0dd6b59db0816821508418addcf62863c84c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Daniel Stenberg <daniel@haxx.se>
|
||
|
|
Date: Sat, 29 Sep 2018 11:32:07 +0200
|
||
|
|
Subject: [PATCH 111/557] multi: fix memory leak in content encoding related
|
||
|
|
error path
|
||
|
|
|
||
|
|
... a missing multi_done() call.
|
||
|
|
|
||
|
|
Credit to OSS-Fuzz
|
||
|
|
Bug: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=10728
|
||
|
|
Closes #3063
|
||
|
|
---
|
||
|
|
lib/multi.c | 10 +++++++---
|
||
|
|
1 file changed, 7 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/lib/multi.c b/lib/multi.c
|
||
|
|
index f202609..9a98435 100644
|
||
|
|
--- a/lib/multi.c
|
||
|
|
+++ b/lib/multi.c
|
||
|
|
@@ -2005,12 +2005,16 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
|
||
|
|
newurl = data->req.location;
|
||
|
|
data->req.location = NULL;
|
||
|
|
result = Curl_follow(data, newurl, FOLLOW_FAKE);
|
||
|
|
- if(result)
|
||
|
|
+ if(result) {
|
||
|
|
stream_error = TRUE;
|
||
|
|
+ result = multi_done(&data->easy_conn, result, TRUE);
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
- multistate(data, CURLM_STATE_DONE);
|
||
|
|
- rc = CURLM_CALL_MULTI_PERFORM;
|
||
|
|
+ if(!result) {
|
||
|
|
+ multistate(data, CURLM_STATE_DONE);
|
||
|
|
+ rc = CURLM_CALL_MULTI_PERFORM;
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
}
|
||
|
|
else if(comeback)
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|