nanosleep: fix integer overflow problem

* lib/nanosleep.c (my_usleep): Don't assume signed integer
arithmetic wraps around on overflow.

diff --git a/ChangeLog b/ChangeLog
index 8e39acf2cd4085ea0fcedfdccb01710d9f7e77ca..84662582095530eaad075432f9fc064913e4adc1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-06-25  Paul Eggert  <eggert@cs.ucla.edu>
 
+       nanosleep: fix integer overflow problem
+       * lib/nanosleep.c (my_usleep): Don't assume signed integer
+       arithmetic wraps around on overflow.
+
        nanosleep: simplify carrying
        * lib/nanosleep.c (nanosleep): Use the requested tv_nsec for the
        first call to the underyling nanosleep, not for the last one.

diff --git a/lib/nanosleep.c b/lib/nanosleep.c
index aae2653b722cad467ef9388f5c52d8e13789f4a2..e08c00268373364eceb4e15ac5eb29270d560c56 100644 (file)
--- a/lib/nanosleep.c
+++ b/lib/nanosleep.c
@@ -210,12 +210,11 @@ my_usleep (const struct timespec *ts_delay)
   tv_delay.tv_usec = (ts_delay->tv_nsec + 999) / 1000;
   if (tv_delay.tv_usec == 1000000)
     {
-      time_t t1 = tv_delay.tv_sec + 1;
-      if (t1 < tv_delay.tv_sec)
+      if (tv_delay.tv_sec == TYPE_MAXIMUM (time_t))
         tv_delay.tv_usec = 1000000 - 1; /* close enough */
       else
         {
-          tv_delay.tv_sec = t1;
+          tv_delay.tv_sec++;
           tv_delay.tv_usec = 0;
         }
     }