From 5cffc05ed5c7fea312f2822d388afc025d03c08a Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 27 Apr 2015 09:57:51 -0700 Subject: Check tzspec_len == 0 in __tzfile_read [BZ#18333] * time/tzset.c (__tzfile_read): Check tzspec_len == 0. --- time/tzfile.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'time') diff --git a/time/tzfile.c b/time/tzfile.c index 46d4fc71ae..57abbb8c14 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)) -- cgit v1.2.3