mktime.c: normalize tp->tm_isdst value to -1/0/1.

* lib/mktime.c (__mktime_internal): Normalize tp->tm_isdst value.
Reported by Michael Ringe <Michael.Ringe@gmx.de> in
<http://sourceware.org/bugzilla/show_bug.cgi?id=6723>.

diff --git a/ChangeLog b/ChangeLog
index 97f6c766781f231265286b0a969832dcc9155728..6c4830867a37a547c50a2cb2795ff9a00d5a1410 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-07-23  Ulrich Drepper  <drepper@redhat.com>
 
+       mktime.c: normalize tp->tm_isdst value to -1/0/1.
+       * lib/mktime.c (__mktime_internal): Normalize tp->tm_isdst value.
+       Reported by Michael Ringe <Michael.Ringe@gmx.de> in
+       <http://sourceware.org/bugzilla/show_bug.cgi?id=6723>.
+
        * lib/canonicalize-lgpl.c (__realpath): Avoid buffer overflow after
        readlink on platforms without PATH_MAX.
 

diff --git a/lib/mktime.c b/lib/mktime.c
index a91fb20e68cf446a15e186df81853ca840cc80c9..f9e7b6071c490c1fab5cc0ea922d49dc3a390487 100644 (file)
--- a/lib/mktime.c
+++ b/lib/mktime.c
@@ -290,7 +290,9 @@ __mktime_internal (struct tm *tp,
   int mday = tp->tm_mday;
   int mon = tp->tm_mon;
   int year_requested = tp->tm_year;
-  int isdst = tp->tm_isdst;
+  /* Normalize the value.  */
+  int isdst = ((tp->tm_isdst >> (8 * sizeof (tp->tm_isdst) - 1))
+              | (tp->tm_isdst != 0));
 
   /* 1 if the previous probe was DST.  */
   int dst2;