From: Yang Tse <yangsita@gmail.com>
Date: Thu, 1 Sep 2011 15:09:46 +0000 (+0200)
Subject: hostip.c: return immediately from Curl_resolv_timeout() upon expired timeout.
X-Git-Tag: curl-7_22_0~52
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f2285a6d399a63fd324bb8c3e90cc4655ef803be;p=curl

hostip.c: return immediately from Curl_resolv_timeout() upon expired timeout.

Ensure existing logic in Curl_resolv_timeout() is not subverted upon getting a
negative timeout from resolve_server(). The timeout in resolve_server() could
be checked to avoid calling Curl_resolv_timeout() with an expired timeout, but
fixing this in this way allows existing logic in resolve_server() to be kept
unchanged.
---

diff --git a/lib/hostip.c b/lib/hostip.c
index e857dced4..d261a163a 100644
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -554,6 +554,10 @@ int Curl_resolv_timeout(struct connectdata *conn,
 
   *entry = NULL;
 
+  if(timeoutms < 0)
+    /* got an already expired timeout */
+    return CURLRESOLV_TIMEDOUT;
+
 #ifdef USE_ALARM_TIMEOUT
   if(data->set.no_signal)
     /* Ignore the timeout when signals are disabled */