diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2009-06-15 11:00:08 -0700 |
|---|---|---|
| committer | Petr Baudis <pasky@suse.cz> | 2009-06-16 00:11:55 +0200 |
| commit | e80cfa694185fc970ca3804660a903b28173cd52 (patch) | |
| tree | a9d9200e2869602202e483cc89822c7d1431cfd2 | |
| parent | 0f1ea04f8ab3ad481089fd705f4bda2df0fd8078 (diff) | |
| download | glibc-e80cfa694185fc970ca3804660a903b28173cd52.tar.gz glibc-e80cfa694185fc970ca3804660a903b28173cd52.tar.xz glibc-e80cfa694185fc970ca3804660a903b28173cd52.zip | |
Fix computation of tzspec_len.
Without this it should never have worked that we can use the embedded envvar in the timezone data files for dates after the last matching rule. (cherry picked from commit 6355c99740c91ed5a7fa14e378f74950e09f5f48)
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | time/tzfile.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index b79f020817..c77ed82e6d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2009-06-15 Ulrich Drepper <drepper@redhat.com> + * time/tzfile.c (__tzfile_read): Correct computation of tzspec_len. + [BZ #10211] * time/tzfile.c (__tzfile_compute): If we use the envvar format still handle leap seconds if they are available. diff --git a/time/tzfile.c b/time/tzfile.c index 4e20b25a12..d8bd55a130 100644 --- a/time/tzfile.c +++ b/time/tzfile.c @@ -248,7 +248,7 @@ __tzfile_read (const char *file, size_t extra, char **extrap) + num_transitions * (8 + 1) + num_types * 6 + chars - + num_leaps * 8 + + num_leaps * 12 + num_isstd + num_isgmt) - 1 : 0); |