r5154 - glibc-package/branches/glibc-branch-squeeze/debian/patches/any
Author: aurel32
Date: 2012-02-02 21:18:51 +0000 (Thu, 02 Feb 2012)
New Revision: 5154
Modified:
glibc-package/branches/glibc-branch-squeeze/debian/patches/any/cvs-tzfile.diff
Log:
Update debian/patches/any/cvs-tzfile.diff
Modified: glibc-package/branches/glibc-branch-squeeze/debian/patches/any/cvs-tzfile.diff
===================================================================
--- glibc-package/branches/glibc-branch-squeeze/debian/patches/any/cvs-tzfile.diff 2012-02-02 21:05:42 UTC (rev 5153)
+++ glibc-package/branches/glibc-branch-squeeze/debian/patches/any/cvs-tzfile.diff 2012-02-02 21:18:51 UTC (rev 5154)
@@ -7,6 +7,14 @@
index 144e20b..402389c 100644
--- a/time/tzfile.c
+++ b/time/tzfile.c
+@@ -26,6 +26,7 @@
+ #include <time.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
++#include <stdint.h>
+
+ #define NOID
+ #include <timezone/tzfile.h>
@@ -234,23 +234,58 @@ __tzfile_read (const char *file, size_t extra, char **extrap)
goto read_again;
}
@@ -64,7 +72,7 @@
+ if (__builtin_expect (tzspec_len < num_isstd, 0))
+ goto lose;
+ tzspec_len -= num_isstd;
-+ if (__builtin_expect (tzspec == 0 || tzspec_len - 1 < num_isgmt, 0))
++ if (__builtin_expect (tzspec_len == 0 || tzspec_len - 1 < num_isgmt, 0))
+ goto lose;
+ tzspec_len -= num_isgmt + 1;
+ if (__builtin_expect (SIZE_MAX - total_size < tzspec_len, 0))
Reply to: