Commit dd830558ffb for php
commit dd830558ffb1ac8378e812b4db97626e6087de3f
Merge: d5eaaa881ce d4235d7cf91
Author: David Carlier <devnexen@gmail.com>
Date: Tue Oct 6 22:45:52 2026 +0100
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
Fix GH-23352: DOMDocument::adoptNode() stale document references
# Conflicts:
# ext/dom/document.c
diff --cc ext/dom/document.c
index fc77a9052dd,377aee8029c..4a0fadab7da
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@@@ -1087,8 -1090,11 +1087,11 @@@ static void php_dom_transfer_document_r
{
php_dom_transfer_document_ref_single_node(node, new_document);
if (node->type == XML_ELEMENT_NODE) {
- for (xmlAttrPtr attr = node->properties; attr; attr = attr->next) {
+ for (xmlAttrPtr attr = node->properties; attr != NULL; attr = attr->next) {
php_dom_transfer_document_ref_single_node((xmlNodePtr) attr, new_document);
+ for (xmlNodePtr child = attr->children; child; child = child->next) {
+ php_dom_transfer_document_ref_single_node((xmlNodePtr) child, new_document);
+ }
}
}
}