[gnurl] 32/151: multi: Fix curl_multi_poll wait when extra_fds && !extra_nfds

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnurl.

commit d1476aa11e26019bc47cb8a3c7cd3445ac051283
Author: Gergely Nagy <address@hidden>
AuthorDate: Sun Nov 17 21:33:54 2019 +0100

    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
---
 lib/multi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 {

-- 
To stop receiving notification emails like this one, please contact
address@hidden.