Handle empty TZ strings at the end of new-style timzeone files correctly.

(cherry picked from commit 7a7c2c24654f7ab69b1cec72c329c8d73f0e4c04)

diff --git a/ChangeLog b/ChangeLog
index aff242074ea792aa02c9d89df6291da30a71b394..8d2284aff48de52fec3d7831908ebae2fa136441 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-23  Andreas Schwab  <aschwab@redhat.com>
+
+       * time/tzfile.c (__tzfile_read): Don't use an empty TZ string.
+
 2009-06-18  Ulrich Drepper  <drepper@redhat.com>
 
        * sysdeps/unix/sysv/linux/bits/socket.h: Define PF_IEEE802154 and

diff --git a/time/tzfile.c b/time/tzfile.c
index d8bd55a130963fec0a7f9f41cf1751f8805d5461..f4cba46e5042ad4515440d52025a1ca4bfd9f11b 100644 (file)
--- a/time/tzfile.c
+++ b/time/tzfile.c
@@ -419,6 +419,10 @@ __tzfile_read (const char *file, size_t extra, char **extrap)
       tzspec = __tzstring (tzstr);
     }
 
+  /* Don't use an empty TZ string.  */
+  if (tzspec != NULL && tzspec[0] == '\0')
+    tzspec = NULL;
+
   fclose (f);
 
   /* First "register" all timezone names.  */