Unverified Commit f3e03f6c authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

multi_done: wait for name resolve to finish if still ongoing

... as we must clean up memory.
parent 5b54df06
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -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 */