diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-11-27 14:58:54 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-11-27 14:58:54 +0400 |
| commit | 504c60dc4451b8ede8814530dbfec0ef485f0ca6 (patch) | |
| tree | 6f4adb879a3f6cf5621916ca977ba73087b16fdd /ext | |
| parent | 16d59aa1718324ff0d4bea62fa9dfc3d4c8b16ce (diff) | |
| parent | 12fe4e90be7bfa2a763197079f68f5568a14e071 (diff) | |
| download | php-git-504c60dc4451b8ede8814530dbfec0ef485f0ca6.tar.gz | |
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src:
Fixed bug #66060 (Heap buffer over-read in DateInterval)
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/date/lib/parse_iso_intervals.c | 4 | ||||
| -rw-r--r-- | ext/date/lib/parse_iso_intervals.re | 2 |
2 files changed, 3 insertions, 3 deletions
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; |