com php-src: Fixed bug #66060 (Heap buffer over-read in DateInterval): NEWS ext/date/lib/parse_iso_intervals.c ext/date/lib/parse _iso_intervals.re

Commit: 12fe4e90be7bfa2a763197079f68f5568a14e071 Author: Remi Collet <remi@php.net> Wed, 27 Nov 2013 11:13:16 +0100 Parents: 63f3ff7b5f89f50eb9df76c3d0860c04cc6e0f66 Branches: PHP-5.4 PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=12fe4e90be7bfa2a763197079f68f5568a14e071 Log: Fixed bug #66060 (Heap buffer over-read in DateInterval) Bugs: https://bugs.php.net/66060 Changed paths: M NEWS M ext/date/lib/parse_iso_intervals.c M ext/date/lib/parse_iso_intervals.re Diff: diff --git a/NEWS b/NEWS index 2514027..dd8f233 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2013, PHP 5.4.24 +- Date: + . Fixed bug #66060 (Heap buffer over-read in DateInterval). (Remi) + ?? ??? 2013, PHP 5.4.23 - Core: diff --git a/ext/date/lib/parse_iso_intervals.c b/ext/date/lib/parse_iso_intervals.c index bd1ad05..480ea38 100644 --- a/ext/date/lib/parse_iso_intervals.c +++ b/ext/date/lib/parse_iso_intervals.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Mon Dec 5 22:02:27 2011 */ +/* Generated by re2c 0.13.5 on Wed Nov 27 11:10:58 2013 */ #line 1 "ext/date/lib/parse_iso_intervals.re" /* +----------------------------------------------------------------------+ @@ -415,7 +415,7 @@ yy6: break; } ptr++; - } while (*ptr); + } while (!s->errors->error_count && *ptr); s->have_period = 1; TIMELIB_DEINIT; return TIMELIB_PERIOD; diff --git a/ext/date/lib/parse_iso_intervals.re b/ext/date/lib/parse_iso_intervals.re index 56aa34d..c5e9f67 100644 --- a/ext/date/lib/parse_iso_intervals.re +++ b/ext/date/lib/parse_iso_intervals.re @@ -383,7 +383,7 @@ isoweek = year4 "-"? "W" weekofyear; break; } ptr++; - } while (*ptr); + } while (!s->errors->error_count && *ptr); s->have_period = 1; TIMELIB_DEINIT; return TIMELIB_PERIOD;