[commits] r8590 - in /fsf/trunk/libc: ChangeLog time/tzfile.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Wed Jun 24 00:07:32 2009
New Revision: 8590

Log:
Import glibc-mainline for 2009-06-24

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/time/tzfile.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Jun 24 00:07:32 2009
@@ -1,3 +1,7 @@
+2009-06-23  Andreas Schwab  <aschwab@xxxxxxxxxx>
+
+	* time/tzfile.c (__tzfile_read): Don't use an empty TZ string.
+
 2009-06-22  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* po/id.po: Update from translation team.

Modified: fsf/trunk/libc/time/tzfile.c
==============================================================================
--- fsf/trunk/libc/time/tzfile.c (original)
+++ fsf/trunk/libc/time/tzfile.c Wed Jun 24 00:07:32 2009
@@ -418,6 +418,10 @@
       tzstr[tzspec_len - 1] = '\0';
       tzspec = __tzstring (tzstr);
     }
+
+  /* Don't use an empty TZ string.  */
+  if (tzspec != NULL && tzspec[0] == '\0')
+    tzspec = NULL;
 
   fclose (f);