[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 15/29: curl: cleanup multi handle on failure
From: |
gnunet |
Subject: |
[gnurl] 15/29: curl: cleanup multi handle on failure |
Date: |
Fri, 10 Jan 2020 23:05:53 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit 271ec6b9b6276499b9e45083611e1d08d951b59a
Author: Daniel Stenberg <address@hidden>
AuthorDate: Sat Jan 4 16:27:56 2020 +0100
curl: cleanup multi handle on failure
... to fix memory leak in error path.
Fixes #4772
Closes #4780
Reported-by: Brian Carpenter
---
src/tool_operate.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/tool_operate.c b/src/tool_operate.c
index 61b130672..9dc59b2e9 100644
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2019, Daniel Stenberg, <address@hidden>, et al.
+ * Copyright (C) 1998 - 2020, Daniel Stenberg, <address@hidden>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -2105,8 +2105,10 @@ static CURLcode parallel_transfers(struct GlobalConfig
*global,
result = add_parallel_transfers(global, multi, share,
&more_transfers, &added_transfers);
- if(result)
+ if(result) {
+ curl_multi_cleanup(multi);
return result;
+ }
while(!mcode && (still_running || more_transfers)) {
mcode = curl_multi_poll(multi, NULL, 0, 1000, NULL);
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [gnurl] 20/29: CURLOPT_READFUNCTION.3: fix fopen params in example, (continued)
- [gnurl] 20/29: CURLOPT_READFUNCTION.3: fix fopen params in example, gnunet, 2020/01/10
- [gnurl] 19/29: CURLOPT_READFUNCTION.3: fix variable name in example, gnunet, 2020/01/10
- [gnurl] 13/29: COPYING: it's 2020!, gnunet, 2020/01/10
- [gnurl] 24/29: multi.h: move INITIAL_MAX_CONCURRENT_STREAMS from public header, gnunet, 2020/01/10
- [gnurl] 17/29: docs: mention CURL_MAX_INPUT_LENGTH restrictions, gnunet, 2020/01/10
- [gnurl] 26/29: RELEASE-PROCEDURE: add four future release dates, gnunet, 2020/01/10
- [gnurl] 14/29: lib: fix compiler warnings with `CURL_DISABLE_VERBOSE_STRINGS`, gnunet, 2020/01/10
- [gnurl] 22/29: curl -w: handle a blank input file correctly, gnunet, 2020/01/10
- [gnurl] 18/29: curl:getparameter return error for --http3 if libcurl doesn't support, gnunet, 2020/01/10
- [gnurl] 25/29: TrackMemory tests: always remove CR before LF, gnunet, 2020/01/10
- [gnurl] 15/29: curl: cleanup multi handle on failure,
gnunet <=
- [gnurl] 16/29: curl: properly free mimepost data, gnunet, 2020/01/10
- [gnurl] 27/29: THANKS: updated with names from the 7.68.0 release, gnunet, 2020/01/10
- [gnurl] 28/29: RELEASE-NOTES: 7.68.0, gnunet, 2020/01/10
- [gnurl] 29/29: Merge tag 'curl-7_68_0', gnunet, 2020/01/10