diff options
| author | Christopher Jones <sixd@php.net> | 2013-07-10 11:13:15 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-07-10 11:13:15 -0700 |
| commit | e2e002d4ea7618039cabe925133760966c70b2a7 (patch) | |
| tree | 805ef320254a391d5d03d1a3617c1b23042d7f2a | |
| parent | 7d163e8a0880ae8af2dd869071393e5dc07ef271 (diff) | |
| parent | 9c4ef501462cb672df1f6736261a1c8beea77c7e (diff) | |
| download | php-git-e2e002d4ea7618039cabe925133760966c70b2a7.tar.gz | |
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
* 'PHP-5.3' of https://git.php.net/repository/php-src:
Merge PHP 5.3.27 NEWS
add test for bug #65236
| -rw-r--r-- | NEWS | 10 | ||||
| -rw-r--r-- | ext/xml/tests/bug65236.phpt | 15 |
2 files changed, 19 insertions, 6 deletions
@@ -2,12 +2,7 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2013, PHP 5.3.28 -?? ??? 2013, PHP 5.3.27 - -### -### DO NOT ADD ENTRIES HERE -### All entries go to 5.3.28 -### +11 Jul 2013, PHP 5.3.27 - Core: . Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC). (Laruence) @@ -35,6 +30,9 @@ PHP NEWS . Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems). (Laruence) +- XML: + . Fixed bug #65236 (heap corruption in xml parser). (Rob) + 06 Jun 2013, PHP 5.3.26 - Core: diff --git a/ext/xml/tests/bug65236.phpt b/ext/xml/tests/bug65236.phpt new file mode 100644 index 0000000000..67b26d663f --- /dev/null +++ b/ext/xml/tests/bug65236.phpt @@ -0,0 +1,15 @@ +--TEST-- +Bug #65236 (heap corruption in xml parser) +--SKIPIF-- +<?php +require_once("skipif.inc"); +?> +--FILE-- +<?php +xml_parse_into_struct(xml_parser_create_ns(), str_repeat("<blah>", 1000), $a); + +echo "Done\n"; +?> +--EXPECTF-- +Warning: xml_parse_into_struct(): Maximum depth exceeded - Results truncated in %s on line %d +Done |