[GNUnet-SVN] r36231 - libmicrohttpd/src/microhttpd

[gnunet]

Author: Karlson2k
Date: 2015-08-08 14:29:58 +0200 (Sat, 08 Aug 2015)
New Revision: 36231

Modified:
   libmicrohttpd/src/microhttpd/daemon.c
Log:
daemon.c: MHD_select(): check for timeout value overflow

Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c       2015-08-08 12:29:51 UTC (rev 
36230)
+++ libmicrohttpd/src/microhttpd/daemon.c       2015-08-08 12:29:58 UTC (rev 
36231)
@@ -2364,7 +2364,10 @@
     {
       /* ltimeout is in ms */
       timeout.tv_usec = (ltimeout % 1000) * 1000;
-      timeout.tv_sec = ltimeout / 1000;
+      if (ltimeout / 1000 > TIMEVAL_TV_SEC_MAX)
+        timeout.tv_sec = TIMEVAL_TV_SEC_MAX;
+      else
+        timeout.tv_sec = (_MHD_TIMEVAL_TV_SEC_TYPE)(ltimeout / 1000);
       tv = &timeout;
     }
   num_ready = MHD_SYS_select_ (max + 1, &rs, &ws, &es, tv);