Handle empty TZ strings at the end of new-style timzeone files correc…

…tly.
rossilxx · Jun 23, 2009 · 7a7c2c2 · 7a7c2c2
1 parent 58d6003
commit 7a7c2c2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-23  Andreas Schwab  <[email protected]>
+
+	* time/tzfile.c (__tzfile_read): Don't use an empty TZ string.
+
 2009-06-22  Ulrich Drepper  <[email protected]>
 
 	* po/id.po: Update from translation team.

diff --git 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.  */