archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.0'

Browse source 
* PHP-8.0:
  Fix #81351: xml_parse may fail, but has no error code
This commit is contained in:
Christoph M. Becker 2021-08-13 17:39:19 +02:00
commit 0f1bf4bbd7
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
4 changed files with 39 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/xml/xml.c
View file

@ -1250,6 +1250,10 @@ 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;
}
parser->isparsing = 1;
ret = XML_Parse(parser->parser, (XML_Char*)data, data_len, isFinal);
parser->isparsing = 0;
@ -1297,6 +1301,10 @@ PHP_FUNCTION(xml_parse_into_struct)
XML_SetElementHandler(parser->parser, _xml_startElementHandler, _xml_endElementHandler);
XML_SetCharacterDataHandler(parser->parser, _xml_characterDataHandler);
if (parser->isparsing) {
php_error_docref(NULL, E_WARNING, "Parser must not be called recursively");
RETURN_FALSE;
}
parser->isparsing = 1;
ret = XML_Parse(parser->parser, (XML_Char*)data, data_len, 1);
parser->isparsing = 0;