Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ext/dom/parentnode.c
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,11 @@ static zend_result dom_sanity_check_node_list_for_insertion(php_libxml_ref_obj *
if (instanceof_function(ce, dom_node_class_entry)) {
xmlNodePtr node = dom_object_get_node(Z_DOMOBJ_P(nodes + i));

if (!node) {
php_dom_throw_error(INVALID_STATE_ERR, /* strict */ true);
return FAILURE;
}

if (node->doc != documentNode) {
php_dom_throw_error(WRONG_DOCUMENT_ERR, dom_get_strict_error(document));
return FAILURE;
Expand Down
31 changes: 31 additions & 0 deletions ext/dom/tests/gh16039.phpt
Original file line number Diff line number Diff line change
@@ -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/>
Loading