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

Fix GH-12231: SimpleXML xpath should warn when returning other return types than node lists

Browse Source 
Closes GH-18073.
This commit is contained in:
Niels Dossche
2025-03-15 01:38:27 +01:00
parent 53eaead824
commit 86a67fef48
5 changed files with 61 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@@ -124,6 +124,10 @@ PHP NEWS
or a TypeError if read_and_close value is not compatible with int.
(David Carlier)
- SimpleXML:
. Fixed bug GH-12231 (SimpleXML xpath should warn when returning other return
types than node lists). (nielsdos)
- SNMP:
. snmpget, snmpset, snmp_get2, snmp_set2, snmp_get3, snmp_set3 and
SNMP::__construct() throw an exception on invalid hostname, community

5
UPGRADING
View File

@@ -82,6 +82,11 @@ PHP 8.5 UPGRADE NOTES
. A ValueError is now thrown when trying to set a cursor name that is too
long on a PDOStatement resulting from the Firebird driver.
- SimpleXML:
- Passing an XPath expression that returns something other than a node set
to SimpleXMLElement::xpath() will now emit a warning and return false,
instead of silently failing and returning an empty array.
- SPL:
. ArrayObject no longer accepts enums, as modifying the $name or $value
properties can break engine assumptions.

22
ext/simplexml/simplexml.c
View File

@@ -1215,6 +1215,21 @@ static int sxe_objects_compare(zval *object1, zval *object2) /* {{{ */
}
/* }}} */
static const char *sxe_get_object_type_name(xmlXPathObjectType type)
{
switch (type) {
case XPATH_BOOLEAN: return "bool";
case XPATH_NUMBER: return "number";
case XPATH_STRING: return "string";
#ifdef LIBXML_XPTR_LOCS_ENABLED
case XPATH_POINT: return "point";
case XPATH_RANGE: return "range";
case XPATH_LOCATIONSET: return "location set";
#endif
default: return "undefined";
}
}
/* {{{ Runs XPath query on the XML data */
PHP_METHOD(SimpleXMLElement, xpath)
{
@@ -1271,6 +1286,13 @@ PHP_METHOD(SimpleXMLElement, xpath)
RETURN_FALSE;
}
if (UNEXPECTED(retval->type != XPATH_NODESET)) {
php_error_docref(NULL, E_WARNING, "XPath expression must return a node set, %s returned",
sxe_get_object_type_name(retval->type));
xmlXPathFreeObject(retval);
RETURN_FALSE;
}
result = retval->nodesetval;
if (result != NULL) {

7
ext/simplexml/tests/008.phpt
View File

@@ -39,8 +39,9 @@ array(1) {
}
}
}
array(0) {
}
Warning: SimpleXMLElement::xpath(): Invalid expression in %s on line %d%A
Warning: SimpleXMLElement::xpath(): XPath expression must return a node set, number returned in %s on line %d
bool(false)
Warning: SimpleXMLElement::xpath(): Invalid expression in %s on line %d
bool(false)

26
ext/simplexml/tests/gh12231.phpt Normal file
View File

@@ -0,0 +1,26 @@
--TEST--
GH-12231 (SimpleXML xpath should warn when returning other return types than node lists)
--EXTENSIONS--
simplexml
--FILE--
<?php
$xml = "<container><foo/><foo/></container>";
$sxe = simplexml_load_string($xml);
var_dump($sxe->xpath("count(//foo)"));
var_dump($sxe->xpath("string(//foo)"));
var_dump($sxe->xpath("boolean(//foo)"));
var_dump(count($sxe->xpath("//foo")));
?>
--EXPECTF--
Warning: SimpleXMLElement::xpath(): XPath expression must return a node set, number returned in %s on line %d
bool(false)
Warning: SimpleXMLElement::xpath(): XPath expression must return a node set, string returned in %s on line %d
bool(false)
Warning: SimpleXMLElement::xpath(): XPath expression must return a node set, bool returned in %s on line %d
bool(false)
int(2)