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)

diff --git a/ChangeLog b/ChangeLog
index b79f0208177aa5c9b5c1def8a074dbd1c960ede5..c77ed82e6db0574fdca43afffb3d98af9afa4ec0 100644 (file)
--- 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 4e20b25a12d44de33165afbd67553119c2f21dda..d8bd55a130963fec0a7f9f41cf1751f8805d5461 100644 (file)
--- 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);