diff options
| author | Matteo Beccati <mbeccati@php.net> | 2015-04-28 10:57:52 +0200 |
|---|---|---|
| committer | Matteo Beccati <mbeccati@php.net> | 2015-04-28 10:57:52 +0200 |
| commit | df490dcf0c45cd83cb744b8c8594160665068864 (patch) | |
| tree | c2dc849b106746914af9c262e3185fd2e74436a0 | |
| parent | 19ad1389aaf0d964de918857164a6ef45f444158 (diff) | |
| parent | b5e5098c50397ed910a79ac1d64b7d0fff2c02e1 (diff) | |
| download | php-git-df490dcf0c45cd83cb744b8c8594160665068864.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix segfault in ext/date since 957aa2
| -rw-r--r-- | ext/date/lib/parse_tz.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c index 4350b3a984..1ae252b034 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 + 1)); - *tzf += (sizeof(unsigned char) * (tz->timecnt + 1)); + *tzf += (sizeof(int64_t) * (tz->timecnt)); + *tzf += (sizeof(unsigned char) * (tz->timecnt)); } } |