aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--time/tzfile.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 23ab3f8..4ef72fc 100644
--- 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-22 Ulrich Drepper <drepper@redhat.com>
* po/id.po: Update from translation team.
diff --git a/time/tzfile.c b/time/tzfile.c
index d8bd55a..f4cba46 100644
--- 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. */