From 4cabbf9781405d1075c770f5e28279aba537f1e3 Mon Sep 17 00:00:00 2001 From: Matteo Beccati Date: Tue, 28 Apr 2015 12:48:00 +0200 Subject: Revert "Fix segfault in ext/date since 957aa2" This reverts commit b5e5098c50397ed910a79ac1d64b7d0fff2c02e1. A proper fix from Derick is underway. I apologise for stepping on his toes ;) --- ext/date/lib/parse_tz.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c index 32ed639f8c..89b8af73d6 100644 --- a/ext/date/lib/parse_tz.c +++ b/ext/date/lib/parse_tz.c @@ -89,8 +89,8 @@ static void read_header(const unsigned char **tzf, timelib_tzinfo *tz) static void skip_transistions_64bit(const unsigned char **tzf, timelib_tzinfo *tz) { if (tz->timecnt) { - *tzf += (sizeof(int64_t) * (tz->timecnt)); - *tzf += (sizeof(unsigned char) * (tz->timecnt)); + *tzf += (sizeof(int64_t) * (tz->timecnt + 1)); + *tzf += (sizeof(unsigned char) * (tz->timecnt + 1)); } } -- cgit v1.2.1 From 9c5c3ff0220f689954ada24b94228b6f3591e37d Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Tue, 28 Apr 2015 13:15:39 +0200 Subject: fix VC9 build with PCRE --- ext/pcre/pcrelib/pcre_internal.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ext/pcre/pcrelib/pcre_internal.h b/ext/pcre/pcrelib/pcre_internal.h index 02d3ab17c5..19d18a830a 100644 --- a/ext/pcre/pcrelib/pcre_internal.h +++ b/ext/pcre/pcrelib/pcre_internal.h @@ -229,11 +229,15 @@ stdint.h is available, include it; it may define INT64_MAX. Systems that do not have stdint.h (e.g. Solaris) may have inttypes.h. The macro int64_t may be set by "configure". */ +#ifdef PHP_WIN32 +#include "win32/php_stdint.h" +#else #if defined HAVE_STDINT_H #include #elif defined HAVE_INTTYPES_H #include #endif +#endif #if defined INT64_MAX || defined int64_t #define INT64_OR_DOUBLE int64_t -- cgit v1.2.1