Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #81351: xml_parse may fail, but has no error code #7363

Closed
wants to merge 2 commits into from
Closed

Fix #81351: xml_parse may fail, but has no error code #7363

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0612e65
Fix #81351: xml_parse may fail, but has no error code
cmb69 Aug 12, 2021
de5b6de
Remove trailing period from error message
cmb69 Aug 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 1 addition & 9 deletions ext/xml/compat.c
View file
Open in desktop
Expand Up @@ -565,16 +565,8 @@ XML_Parse(XML_Parser parser, const XML_Char *data, int data_len, int is_final)
{
int error;

if (parser->parser->lastError.level >= XML_ERR_WARNING) {
return 0;
}

error = xmlParseChunk(parser->parser, (char *) data, data_len, is_final);
if (error) {
return 0;
} else {
return 1;
}
return !error && parser->parser->lastError.level <= XML_ERR_WARNING;
}

PHP_XML_API int
Expand Down
4 changes: 4 additions & 0 deletions ext/xml/tests/bug73135.phpt
View file
Open in desktop
Expand Up @@ -21,6 +21,10 @@ 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
28 changes: 28 additions & 0 deletions ext/xml/tests/bug81351.phpt
View file
Open in desktop
@@ -0,0 +1,28 @@
--TEST--
Bug #81351 (xml_parse may fail, but has no error code)
--SKIPIF--
<?php
if (!extension_loaded('xml')) die("skip xml extension not available");
?>
--FILE--
<?php
$xml = <<<XML
<?xml version="1.0" encoding="utf-8"?>
<soap:Envelope xmlns:soap="http://www.w3.org/2003/05/soap-envelope" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<soap:Body>
<X xmlns="example.org">
XML;

$parser = xml_parser_create_ns('UTF-8');
$success = xml_parse($parser, $xml, false);
$code = xml_get_error_code($parser);
$error = xml_error_string($code);
echo "xml_parse returned $success, xml_get_error_code = $code, xml_error_string = $error\r\n";
$success = xml_parse($parser, 'Y>', true);
$code = xml_get_error_code($parser);
$error = xml_error_string($code);
echo "xml_parse returned $success, xml_get_error_code = $code, xml_error_string = $error\r\n";
?>
--EXPECT--
xml_parse returned 1, xml_get_error_code = 0, xml_error_string = No error
xml_parse returned 0, xml_get_error_code = 5, xml_error_string = Invalid document end
8 changes: 8 additions & 0 deletions ext/xml/xml.c
View file
Open in desktop
Expand Up @@ -1416,6 +1416,10 @@ PHP_FUNCTION(xml_parse)
RETURN_FALSE;
}

if (parser->isparsing) {
php_error_docref(NULL, E_WARNING, "Parser must not be called recursively.");
cmb69 marked this conversation as resolved.
Show resolved Hide resolved
RETURN_FALSE;
}
parser->isparsing = 1;
ret = XML_Parse(parser->parser, (XML_Char*)data, data_len, isFinal);
parser->isparsing = 0;
Expand Down Expand Up @@ -1467,6 +1471,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;
Expand Down