diff options
author | Gergely Nagy <ngg@tresorit.com> | 2019-11-17 21:33:54 +0100 |
---|---|---|
committer | Jay Satiro <raysatiro@yahoo.com> | 2019-11-17 23:35:48 -0500 |
commit | d1476aa11e26019bc47cb8a3c7cd3445ac051283 (patch) | |
tree | 084ad725d75440e2708361c084194d5bff3c81f7 | |
parent | 1f6a18685ef46c900f493179337492995312cbf6 (diff) |
multi: Fix curl_multi_poll wait when extra_fds && !extra_nfds
Prior to this change:
The check if an extra wait is necessary was based not on the
number of extra fds but on the pointer.
If a non-null pointer was given in extra_fds, but extra_nfds
was zero, then the wait was skipped even though poll was not
called.
Closes https://github.com/curl/curl/pull/4610
-rwxr-xr-x | lib/multi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/multi.c b/lib/multi.c index a0de107f0..9faad0e2e 100755 --- a/lib/multi.c +++ b/lib/multi.c @@ -1147,7 +1147,7 @@ static CURLMcode Curl_multi_wait(struct Curl_multi *multi, free(ufds); if(ret) *ret = retcode; - if(!extrawait || extra_fds || curlfds) + if(!extrawait || nfds) /* if any socket was checked */ ; else { |