php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.0'

Browse Source 
* PHP-8.0:
  Fix return value of xml_parse(_into_struct) for recursive parsing
This commit is contained in:
Christoph M. Becker
2021-08-13 19:01:19 +02:00
parent 0f1bf4bbd7 15e5cf856a
commit 6db4b972d0
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ext/xml/tests/bug73135.phpt
View File

@@ -21,10 +21,6 @@ HERE;
xml_parse($parser, $xml);
?>
--EXPECTF--
Warning: xml_parse(): Parser must not be called recursively in %s%ebug73135.php on line %d
Warning: xml_parse(): Parser must not be called recursively in %s%ebug73135.php on line %d
Warning: xml_parse(): Unable to call handler ahihi() in %s%ebug73135.php on line %d
Warning: xml_parse(): Unable to call handler ahihi() in %s%ebug73135.php on line %d
Fatal error: Uncaught Error: Parser must not be called recursively in %s:%d
Stack trace:
%a

4
ext/xml/xml.c
View File

@@ -1251,8 +1251,8 @@ PHP_FUNCTION(xml_parse)
parser = Z_XMLPARSER_P(pind);
if (parser->isparsing) {
php_error_docref(NULL, E_WARNING, "Parser must not be called recursively");
RETURN_FALSE;
zend_throw_error(NULL, "Parser must not be called recursively");
RETURN_THROWS();
}
parser->isparsing = 1;
ret = XML_Parse(parser->parser, (XML_Char*)data, data_len, isFinal);