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

diff --cc ext/date/lib/parse_date.c
index 14a6d73c32a5ca5b9116d8154f4db52daac22ff1,4b83451f908a6b35d8c3f8faafe3f4446ffebf01..d7db06f4fc06002d7f63a391fae2f49bc5f2b74e
--- 1/ext/date/lib/parse_date.c
--- 2/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 dad5bb4b2511e1ab28ebd87000a633e2a6298961,2a0687cbaaaf8e363eb0beab274c9fbdbe307651..66efba15893441693faa1406c1a409c2f6a82c56
--- 1/ext/date/lib/parse_date.re
--- 2/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;