ce426f
commit 5cffc05ed5c7fea312f2822d388afc025d03c08a
ce426f
Author: H.J. Lu <hjl.tools@gmail.com>
ce426f
Date:   Mon Apr 27 09:57:51 2015 -0700
ce426f
ce426f
    Check tzspec_len == 0 in __tzfile_read
ce426f
    
ce426f
    	[BZ#18333]
ce426f
    	* time/tzset.c (__tzfile_read): Check tzspec_len == 0.
ce426f
ce426f
--- a/time/tzfile.c
ce426f
+++ b/time/tzfile.c
ce426f
@@ -283,7 +283,8 @@
ce426f
       if (__builtin_expect (tzspec_len == 0 || tzspec_len - 1 < num_isgmt, 0))
ce426f
 	goto lose;
ce426f
       tzspec_len -= num_isgmt + 1;
ce426f
-      if (__builtin_expect (SIZE_MAX - total_size < tzspec_len, 0))
ce426f
+      if (__builtin_expect (tzspec_len == 0
ce426f
+                            || SIZE_MAX - total_size < tzspec_len, 0))
ce426f
 	goto lose;
ce426f
     }
ce426f
   if (__builtin_expect (SIZE_MAX - total_size - tzspec_len < extra, 0))