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
4 changes: 4 additions & 0 deletions ext/dom/node.c
Original file line number Diff line number Diff line change
Expand Up @@ -1513,6 +1513,10 @@ PHP_METHOD(DOMNode, cloneNode)
if (clone_document && private_data != NULL) {
php_dom_private_data_destroy(private_data);
}
if (instanceof_function(intern->std.ce, dom_modern_node_class_entry)) {
php_dom_throw_error(INVALID_STATE_ERR, /* strict */ true);
RETURN_THROWS();
}
RETURN_FALSE;
}

Expand Down
8 changes: 5 additions & 3 deletions ext/dom/php_dom.c
Original file line number Diff line number Diff line change
Expand Up @@ -663,9 +663,11 @@ static zend_object *dom_objects_store_clone_obj(zend_object *zobject) /* {{{ */
xmlNodePtr cloned_node = dom_clone_node(php_dom_ns_mapper_from_private(private_data), node, node->doc, true);
if (cloned_node != NULL) {
dom_update_refcount_after_clone(intern, node, clone, cloned_node);
}
if (private_data != NULL) {
clone->document->private_data = php_dom_libxml_private_data_header(private_data);
if (private_data != NULL) {
clone->document->private_data = php_dom_libxml_private_data_header(private_data);
}
} else if (private_data != NULL && (node->type == XML_DOCUMENT_NODE || node->type == XML_HTML_DOCUMENT_NODE)) {
php_dom_private_data_destroy(private_data);
}
}
}
Expand Down
27 changes: 27 additions & 0 deletions ext/dom/tests/modern/xml/gh25268_declarations.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
--TEST--
GH-25268 (NULL php_libxml_ref_obj dereference in dom_objects_store_clone_obj when cloning DTD declarations)
--EXTENSIONS--
dom
--FILE--
<?php
$dom = Dom\XMLDocument::createFromString('<!DOCTYPE root [<!ELEMENT root EMPTY><!ENTITY e "x">]><root/>');

foreach ([$dom->doctype->entities->getNamedItem("e"), $dom->doctype->childNodes[0]] as $decl) {
$clone = clone $decl;
try {
var_dump($clone->nodeName);
} catch (DOMException $e) {
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
try {
var_dump($decl->cloneNode());
} catch (DOMException $e) {
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
}
}
?>
--EXPECT--
DOMException: Invalid State Error
DOMException: Invalid State Error
DOMException: Invalid State Error
DOMException: Invalid State Error
Loading