From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 18 Oct 2016 07:45:34 +0000 (+0200)
Subject: Curl_socket_check: add extra check to avoid integer overflow
X-Git-Tag: curl-7_51_0~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9aa2afc3a57939e9cfc04926a2ffc20fb87286cf;p=thirdparty%2Fcurl.git

Curl_socket_check: add extra check to avoid integer overflow
---

diff --git a/lib/select.c b/lib/select.c
index abf55d878f..b9c110eb3b 100644
--- a/lib/select.c
+++ b/lib/select.c
@@ -165,6 +165,12 @@ int Curl_socket_check(curl_socket_t readfd0, /* two sockets to read from */
   int r;
   int ret;
 
+#if SIZEOF_LONG != SIZEOF_INT
+  /* wrap-around precaution */
+  if(timeout_ms >= INT_MAX)
+    timeout_ms = INT_MAX;
+#endif
+
   if((readfd0 == CURL_SOCKET_BAD) && (readfd1 == CURL_SOCKET_BAD) &&
      (writefd == CURL_SOCKET_BAD)) {
     /* no sockets, just wait */