diff options
| author | Andreas Schwab <aschwab@redhat.com> | 2009-06-23 09:13:30 -0700 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2009-06-23 09:13:30 -0700 |
| commit | 7a7c2c24654f7ab69b1cec72c329c8d73f0e4c04 (patch) | |
| tree | 3e36fb290b088727ae55b85cc1ba8dedf3a6cd3f | |
| parent | 58d60030dfd14a640e30cbcc231b12a63cdba7d0 (diff) | |
| download | glibc-7a7c2c24654f7ab69b1cec72c329c8d73f0e4c04.tar.gz glibc-7a7c2c24654f7ab69b1cec72c329c8d73f0e4c04.tar.xz glibc-7a7c2c24654f7ab69b1cec72c329c8d73f0e4c04.zip | |
Handle empty TZ strings at the end of new-style timzeone files correctly.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | time/tzfile.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 23ab3f8052..4ef72fc02c 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 d8bd55a130..f4cba46e50 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. */ |