From: Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
Date: Wed, 12 Aug 2015 22:20:12 +0000 (+0200)
Subject: Fix timeout adjustment in c528cec4
X-Git-Tag: exim-4_87_RC1~121
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=85ff3cf9f3ab78c4dfa9f9ff34d27e6fe8f73c39;p=exim.git

Fix timeout adjustment in c528cec4
---

diff --git a/src/src/ip.c b/src/src/ip.c
index 7991a5850..2d717051e 100644
--- a/src/src/ip.c
+++ b/src/src/ip.c
@@ -455,7 +455,7 @@ time_t start_recv = time(NULL);
 int time_left = timeout;
 int rc;
 
-if (timeout <= 0)
+if (time_left <= 0)
   {
   errno = ETIMEDOUT;
   return FALSE;
@@ -484,8 +484,10 @@ do
   if (rc < 0 && errno == EINTR)
     {
     DEBUG(D_transport) debug_printf("EINTR while waiting for socket data\n");
+
     /* Watch out, 'continue' jumps to the condition, not to the loops top */
-    if (time_left = timeout - (time(NULL) - start_recv)) continue;
+    time_left = timeout - (time(NULL) - start_recv);
+    if (time_left > 0) continue;
     }
 
   if (rc <= 0)