From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 15 Jun 2009 18:00:08 +0000 (-0700)
Subject: Fix computation of tzspec_len.
X-Git-Tag: fedora/glibc-2.10.1-3~4^2~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e80cfa694185fc970ca3804660a903b28173cd52;p=thirdparty%2Fglibc.git

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 b79f0208177..c77ed82e6db 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 4e20b25a12d..d8bd55a1309 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);