From: Matteo Beccati <mbeccati@php.net>
Date: Tue, 28 Apr 2015 10:48:00 +0000 (+0200)
Subject: Revert "Fix segfault in ext/date since 957aa2"
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~134
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7778a5a9b41dbe9096904e549c08d1f210231b6c;p=php

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 ;)
---

diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c
index 10087cb5a5..1d873fad6a 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));
 	}
 }