From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 16 Mar 2020 08:33:27 +0000 (+0100)
Subject: tool_operate: fix add_parallel_transfers when more are in queue
X-Git-Tag: curl-7_70_0~231
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=95c36fff75883ace6e8e7a89b94362de2dd1857f;p=thirdparty%2Fcurl.git

tool_operate: fix add_parallel_transfers when more are in queue

Trying to return early from the function if no new transfers were added
would break the "morep" argument and cause issues. This could lead to
zero content "transfers" (within quotes since they would never be
started) when parallel-max was reduced.

Reported-by: Gavin Wong
Analyzed-by: Jay Satiro
Fixes #4937
Closes #5112
---

diff --git a/src/tool_operate.c b/src/tool_operate.c
index 4b3caa80c9..ab06b71c5b 100644
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -2055,7 +2055,7 @@ static CURLcode add_parallel_transfers(struct GlobalConfig *global,
   *addedp = FALSE;
   *morep = FALSE;
   result = create_transfer(global, share, addedp);
-  if(result || !*addedp)
+  if(result)
     return result;
   for(per = transfers; per && (all_added < global->parallel_max);
       per = per->next) {