Skip to content

Commit

Permalink
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into…
Browse files Browse the repository at this point in the history
… 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
  • Loading branch information
cjbj committed Jul 10, 2013
2 parents 7d163e8 + 9c4ef50 commit e2e002d
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 6 deletions.
10 changes: 4 additions & 6 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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:
Expand Down
15 changes: 15 additions & 0 deletions ext/xml/tests/bug65236.phpt
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit e2e002d

Please sign in to comment.