Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #81351: xml_parse may fail, but has no error code

Author: cmb69

NEWS

@@ -7,6 +7,9 @@ PHP                                                                        NEWS
   . Fixed bug #81346 (Non-seekable streams don't update position after write).
     (cmb)
 
+- XML:
+  . Fixed bug #81351 (xml_parse may fail, but has no error code). (cmb, Nikita)
+
 26 Aug 2021, PHP 8.0.10
 
 - Core:

ext/xml/compat.c

@@ -563,16 +563,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

ext/xml/tests/bug73135.phpt

@@ -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

ext/xml/tests/bug81351.phpt

@@ -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

ext/xml/xml.c

@@ -1257,6 +1257,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;
@@ -1304,6 +1308,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;