From e80cfa694185fc970ca3804660a903b28173cd52 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 15 Jun 2009 11:00:08 -0700 Subject: [PATCH] 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) --- ChangeLog | 2 ++ time/tzfile.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b79f0208177..c77ed82e6db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2009-06-15 Ulrich Drepper + * 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); -- 2.47.2