diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-05-13 17:02:09 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-05-13 17:02:09 -0700 |
| commit | a03a1ab88cd2c62f04c77acf16bcab757552fd35 (patch) | |
| tree | d7b971f777ee84cba9ea9fbd0a77a68d034385f8 /sapi/phpdbg/phpdbg_help.c | |
| parent | e3a48b3a43eb486ae969729616acfe994977b7be (diff) | |
| parent | dc92e81922405646f4e7f124d96643243088e0a6 (diff) | |
| download | php-git-a03a1ab88cd2c62f04c77acf16bcab757552fd35.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix bug #67253: timelib_meridian_with_check out-of-bounds read
Fix bug #67252: convert_uudecode out-of-bounds read
Fix bug #67251 - date_parse_from_format out-of-bounds read
Fix bug #67250 (iptcparse out-of-bounds read)
Conflicts:
ext/date/lib/parse_date.c
ext/date/lib/parse_date.re
Diffstat (limited to 'sapi/phpdbg/phpdbg_help.c')
0 files changed, 0 insertions, 0 deletions