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

Merge branch 'PHP-8.3' into PHP-8.4

Browse source 
* PHP-8.3:
  Fix GH-16292: Segmentation fault in ext/xmlreader/php_xmlreader.c:1282
This commit is contained in:
Niels Dossche 2024-10-08 20:58:20 +02:00
commit 1f84f5c27a
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5
4 changed files with 38 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
NEWS
View file

@ -2,6 +2,10 @@ PHP NEWS
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 8.4.0RC3 ?? ??? ????, PHP 8.4.0RC3
- XMLReader:
. Fixed bug GH-16292 (Segmentation fault in ext/xmlreader/php_xmlreader.c).
(nielsdos)
10 Oct 2024, PHP 8.4.0RC2 10 Oct 2024, PHP 8.4.0RC2
- CGI: - CGI:

2
ext/dom/xml_common.h
View file

@ -60,7 +60,7 @@ PHP_DOM_EXPORT xmlNodePtr dom_object_get_node(dom_object *obj);
__intern = Z_LIBXML_NODE_P(__id); \ __intern = Z_LIBXML_NODE_P(__id); \
if (UNEXPECTED(__intern->node == NULL)) { \ if (UNEXPECTED(__intern->node == NULL)) { \
php_error_docref(NULL, E_WARNING, "Couldn't fetch %s", \ php_error_docref(NULL, E_WARNING, "Couldn't fetch %s", \
ZSTR_VAL(__intern->std.ce->name));\ ZSTR_VAL(Z_OBJCE_P(__zv)->name));\
RETURN_NULL();\ RETURN_NULL();\
} \ } \
__ptr = (__prtype)__intern->node->node; \ __ptr = (__prtype)__intern->node->node; \

8
ext/xmlreader/php_xmlreader.c
View file

@ -1279,7 +1279,13 @@ PHP_METHOD(XMLReader, expand)
} }
if (basenode != NULL) { if (basenode != NULL) {
NODE_GET_OBJ(node, basenode, xmlNodePtr, domobj); /* Note: cannot use NODE_GET_OBJ here because of the wrong return type */
domobj = Z_LIBXML_NODE_P(basenode);
if (UNEXPECTED(domobj->node == NULL)) {
php_error_docref(NULL, E_WARNING, "Couldn't fetch %s", ZSTR_VAL(Z_OBJCE_P(basenode)->name));
RETURN_FALSE;
}
node = domobj->node->node;
docp = node->doc; docp = node->doc;
} }

26
ext/xmlreader/tests/gh16292.phpt Normal file
View file

@ -0,0 +1,26 @@
--TEST--
GH-16292 (Segmentation fault in ext/xmlreader/php_xmlreader.c:1282)
--EXTENSIONS--
dom
xmlreader
--FILE--
<?php
$character_data = new DOMCharacterData();
$xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
<books><book>new book</book></books>';
$reader = new XMLReader();
$reader->XML($xmlstring);
while ($reader->read()) {
if ($reader->localName == "book") {
var_dump($reader->expand($character_data));
}
}
?>
--EXPECTF--
Warning: XMLReader::expand(): Couldn't fetch DOMCharacterData in %s on line %d
bool(false)
Warning: XMLReader::expand(): Couldn't fetch DOMCharacterData in %s on line %d
bool(false)