summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorMatteo Beccati <mbeccati@php.net>2015-04-28 12:48:00 +0200
committerMatteo Beccati <mbeccati@php.net>2015-04-28 12:56:11 +0200
commit4cabbf9781405d1075c770f5e28279aba537f1e3 (patch)
tree7235c930b747091c4024d615dfe9bf9c59ab866c /ext
parent97fcbf041af509bcb5c129b15ba5b6ce98f81cb6 (diff)
downloadphp-git-4cabbf9781405d1075c770f5e28279aba537f1e3.tar.gz
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 ;)
Diffstat (limited to 'ext')
-rw-r--r--ext/date/lib/parse_tz.c4
1 files 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));
}
}