[GNUnet-SVN] [gnurl] 16/73: multi_done: wait for name resolve to finish if still ongoing

[gnunet]

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

ng0 pushed a commit to branch master
in repository gnurl.

commit f3e03f6c0ac52a1bf396e03f7d7e9b5b3b7165fe
Author: Daniel Stenberg <address@hidden>
AuthorDate: Sat Oct 7 17:54:41 2017 +0200

    multi_done: wait for name resolve to finish if still ongoing
    
    ... as we must clean up memory.
---
 lib/multi.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/multi.c b/lib/multi.c
index faf42f1fa..ec679ba4a 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -537,6 +537,12 @@ static CURLcode multi_done(struct connectdata **connp,
     /* Stop if multi_done() has already been called */
     return CURLE_OK;
 
+  if(data->mstate == CURLM_STATE_WAITRESOLVE) {
+    /* done while still waiting for the resolve to complete */
+    struct Curl_dns_entry *throw_away;
+    (void)Curl_resolver_wait_resolv(conn, &throw_away);
+  }
+
   Curl_getoff_all_pipelines(data, conn);
 
   /* Cleanup possible redirect junk */

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