diff options
| author | Remi Collet <remi@php.net> | 2013-11-27 11:13:16 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2013-11-27 11:13:16 +0100 |
| commit | 12fe4e90be7bfa2a763197079f68f5568a14e071 (patch) | |
| tree | b5b1bada15406199833573162e849b1a010dfbb5 | |
| parent | 63f3ff7b5f89f50eb9df76c3d0860c04cc6e0f66 (diff) | |
| download | php-git-12fe4e90be7bfa2a763197079f68f5568a14e071.tar.gz | |
Fixed bug #66060 (Heap buffer over-read in DateInterval)
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/date/lib/parse_iso_intervals.c | 4 | ||||
| -rw-r--r-- | ext/date/lib/parse_iso_intervals.re | 2 |
3 files changed, 6 insertions, 3 deletions
@@ -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 bd1ad05ddd..480ea38d91 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 56aa34d8e0..c5e9f677ba 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; |