Skip to content

Commit 18c2e62

Browse files
committed
changes from feedback
1 parent e5a5e41 commit 18c2e62

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

ext/dom/php_dom.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ static zend_object *dom_objects_store_clone_obj(zend_object *zobject) /* {{{ */
584584

585585
if (instanceof_function(intern->std.ce, dom_node_class_entry) || instanceof_function(intern->std.ce, dom_modern_node_class_entry)) {
586586
xmlNodePtr node = (xmlNodePtr)dom_object_get_node(intern);
587-
if (node != NULL && node->doc) {
587+
if (node != NULL) {
588588
php_dom_libxml_ns_mapper *ns_mapper = NULL;
589589
if (php_dom_follow_spec_intern(intern)) {
590590
if (node->type == XML_DOCUMENT_NODE || node->type == XML_HTML_DOCUMENT_NODE) {
@@ -598,7 +598,9 @@ static zend_object *dom_objects_store_clone_obj(zend_object *zobject) /* {{{ */
598598
if (cloned_node != NULL) {
599599
dom_update_refcount_after_clone(intern, node, clone, cloned_node);
600600
}
601-
clone->document->private_data = php_dom_libxml_ns_mapper_header(ns_mapper);
601+
if (ns_mapper != NULL) {
602+
clone->document->private_data = php_dom_libxml_ns_mapper_header(ns_mapper);
603+
}
602604
}
603605
}
604606

ext/dom/tests/gh14652.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@ private function __clone() {
1616
}
1717
$clone = clone $script1_dataflow;
1818
echo "OK";
19+
?>
1920
--EXPECT--
2021
OK

0 commit comments

Comments
 (0)