com php-src: Merge branch 'bug67251' into PHP-5.4: ext/date/lib /parse_date.c ext/date/lib/parse_date.re

Commit: dc92e81922405646f4e7f124d96643243088e0a6 Author: Stanislav Malyshev <stas@php.net> Tue, 13 May 2014 16:52:17 -0700 Parents: 0094fd096905d2d3e53b12c76cfc27976dc2db03 0a80849250162d89b674f7e65144e463e107b8cd Branches: PHP-5.4 PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=dc92e81922405646f4e7f124d96643243088e0a6 Log: Merge branch 'bug67251' into PHP-5.4 * bug67251: Fix bug #67251 - date_parse_from_format out-of-bounds read Conflicts: ext/date/lib/parse_date.c Bugs: https://bugs.php.net/67251 Changed paths: MM ext/date/lib/parse_date.c MM ext/date/lib/parse_date.re Diff: diff --cc ext/date/lib/parse_date.c index 14a6d73,4b83451..d7db06f --- a/ext/date/lib/parse_date.c +++ b/ext/date/lib/parse_date.c @@@ -1,4 -1,4 +1,4 @@@ - /* Generated by re2c 0..13.5 on Tue May 13 16:47:20 2014 */ -/* Generated by re2c 0.13.5 on Sun May 11 19:30:56 2014 */ ++/* Generated by re2c 0.13.5 on Tue May 13 16:52:44 2014 */ #line 1 "ext/date/lib/parse_date.re" /* +----------------------------------------------------------------------+ @@@ -25127,6 -25124,10 +25127,10 @@@ timelib_time *timelib_parse_from_format break; case '\\': /* escaped char */ - if(!fptr[1]) { - add_pbf_error(s, "Escaped character expected", string, begin); - break; - } ++ if(!fptr[1]) { ++ add_pbf_error(s, "Escaped character expected", string, begin); ++ break; ++ } fptr++; if (*ptr == *fptr) { ++ptr; diff --cc ext/date/lib/parse_date.re index dad5bb4,2a0687c..66efba1 --- a/ext/date/lib/parse_date.re +++ b/ext/date/lib/parse_date.re @@@ -2134,6 -2131,10 +2134,10 @@@ timelib_time *timelib_parse_from_format break; case '\\': /* escaped char */ - if(!fptr[1]) { - add_pbf_error(s, "Escaped character expected", string, begin); - break; - } ++ if(!fptr[1]) { ++ add_pbf_error(s, "Escaped character expected", string, begin); ++ break; ++ } fptr++; if (*ptr == *fptr) { ++ptr;