]> granicus.if.org Git - php/commit
Merge branch 'bug67251' into PHP-5.4
authorStanislav Malyshev <stas@php.net>
Tue, 13 May 2014 23:52:17 +0000 (16:52 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 13 May 2014 23:52:45 +0000 (16:52 -0700)
commitdc92e81922405646f4e7f124d96643243088e0a6
treee8558709fa60c0ebbacdfc8e5c429a8243a6d8f8
parent0094fd096905d2d3e53b12c76cfc27976dc2db03
parent0a80849250162d89b674f7e65144e463e107b8cd
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
ext/date/lib/parse_date.c
ext/date/lib/parse_date.re