This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.21-287-g5cffc05
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 27 Apr 2015 17:06:44 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.21-287-g5cffc05
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 5cffc05ed5c7fea312f2822d388afc025d03c08a (commit)
from cc8dcf96e71dd643f929e32150904cd6ad69efa8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5cffc05ed5c7fea312f2822d388afc025d03c08a
commit 5cffc05ed5c7fea312f2822d388afc025d03c08a
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Mon Apr 27 09:57:51 2015 -0700
Check tzspec_len == 0 in __tzfile_read
[BZ#18333]
* time/tzset.c (__tzfile_read): Check tzspec_len == 0.
diff --git a/ChangeLog b/ChangeLog
index 373b12c..39f74cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-27 H.J. Lu <hongjiu.lu@intel.com>
+
+ [BZ#18333]
+ * time/tzset.c (__tzfile_read): Check tzspec_len == 0.
+
2015-04-27 Florian Weimer <fweimer@redhat.com>
[BZ#18333]
diff --git a/time/tzfile.c b/time/tzfile.c
index 46d4fc7..57abbb8 100644
--- a/time/tzfile.c
+++ b/time/tzfile.c
@@ -270,7 +270,8 @@ __tzfile_read (const char *file, size_t extra, char **extrap)
if (__glibc_unlikely (tzspec_len == 0 || tzspec_len - 1 < num_isgmt))
goto lose;
tzspec_len -= num_isgmt + 1;
- if (__glibc_unlikely (SIZE_MAX - total_size < tzspec_len))
+ if (__glibc_unlikely (tzspec_len == 0
+ || SIZE_MAX - total_size < tzspec_len))
goto lose;
}
if (__glibc_unlikely (SIZE_MAX - total_size - tzspec_len < extra))
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
time/tzfile.c | 3 ++-
2 files changed, 7 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources