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

Merge branch 'PHP-8.4'

Browse Source 
* PHP-8.4:
  Fix GH-16039: Segmentation fault (access null pointer) in ext/dom/parentnode/tree.c
This commit is contained in:
Niels Dossche
2024-09-25 19:39:58 +02:00
parent 2c3c2381e1 97546746d0
commit 0d1d905353
2 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ext/dom/parentnode/tree.c
View File

@@ -379,6 +379,11 @@ xmlNode* dom_zvals_to_single_node(php_libxml_ref_obj *document, xmlNode *context
newNodeObj = Z_DOMOBJ_P(&nodes[i]);
newNode = dom_object_get_node(newNodeObj);
if (UNEXPECTED(!newNode)) {
php_dom_throw_error(INVALID_STATE_ERR, /* strict */ true);
goto err;
}
if (!dom_is_pre_insert_valid_without_step_1(document, node, newNode, NULL, documentNode)) {
goto err;
}

31
ext/dom/tests/gh16039.phpt Normal file
View File

@@ -0,0 +1,31 @@
--TEST--
GH-16039 (Segmentation fault (access null pointer) in ext/dom/parentnode/tree.c)
--EXTENSIONS--
dom
--FILE--
<?php
$dom = new DOMDocument;
$element = $dom->appendChild($dom->createElement('root'));
try {
$element->prepend('x', new DOMEntity);
} catch (DOMException $e) {
echo $e->getMessage(), "\n";
}
echo $dom->saveXML();
$dom->strictErrorChecking = false; // Should not have influence
try {
$element->prepend('x', new DOMEntity);
} catch (DOMException $e) {
echo $e->getMessage(), "\n";
}
echo $dom->saveXML();
?>
--EXPECT--
Invalid State Error
<?xml version="1.0"?>
<root/>
Invalid State Error
<?xml version="1.0"?>
<root/>