Dirk Manske's fix that makes sure we cancel the ares resolve when we time out

from a name resolve. Without this, we leak memory!

diff --git a/lib/hostip.c b/lib/hostip.c
index 503231c0f7891b9d4464ed6620ebef7f4ce5d5e1..6f25de94e043c1862cbdff91c77858346c07f8d8 100644 (file)
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -617,7 +617,7 @@ CURLcode Curl_wait_for_resolv(struct connectdata *conn,
     timeout = conn->data->set.timeout;
 
   /* Wait for the name resolve query to complete. */
-  while (timeout > 0) {
+  while (1) {
     int nfds=0;
     fd_set read_fds, write_fds;
     struct timeval *tvp, tv, store;
@@ -641,6 +641,11 @@ CURLcode Curl_wait_for_resolv(struct connectdata *conn,
     ares_process(data->state.areschannel, &read_fds, &write_fds);
 
     timeout -= Curl_tvdiff(Curl_tvnow(), now)/1000; /* spent time */
+    if (timeout < 0) {
+      /* our timeout, so we cancel the ares operation */
+      ares_cancel(data->state.areschannel);
+      break;
+    }
   }
 
   /* Operation complete, if the lookup was successful we now have the entry