Skip to content

Commit e2e002d

Browse files
committed
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
2 parents 7d163e8 + 9c4ef50 commit e2e002d

File tree

2 files changed

+19
-6
lines changed

2 files changed

+19
-6
lines changed

NEWS

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@ PHP NEWS
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
33
?? ??? 2013, PHP 5.3.28
44

5-
?? ??? 2013, PHP 5.3.27
6-
7-
###
8-
### DO NOT ADD ENTRIES HERE
9-
### All entries go to 5.3.28
10-
###
5+
11 Jul 2013, PHP 5.3.27
116

127
- Core:
138
. Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC). (Laruence)
@@ -35,6 +30,9 @@ PHP NEWS
3530
. Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on
3631
64-bits systems). (Laruence)
3732

33+
- XML:
34+
. Fixed bug #65236 (heap corruption in xml parser). (Rob)
35+
3836
06 Jun 2013, PHP 5.3.26
3937

4038
- Core:

ext/xml/tests/bug65236.phpt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
--TEST--
2+
Bug #65236 (heap corruption in xml parser)
3+
--SKIPIF--
4+
<?php
5+
require_once("skipif.inc");
6+
?>
7+
--FILE--
8+
<?php
9+
xml_parse_into_struct(xml_parser_create_ns(), str_repeat("<blah>", 1000), $a);
10+
11+
echo "Done\n";
12+
?>
13+
--EXPECTF--
14+
Warning: xml_parse_into_struct(): Maximum depth exceeded - Results truncated in %s on line %d
15+
Done

0 commit comments

Comments
 (0)