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.

diff --git a/ChangeLog b/ChangeLog
index d758a8394f2ab7f8d7be961fa13741781d9a12fe..9e13cb79451bfb75e8a8b81f287bc99072ed3969 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);