Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
  Fix xinclude destruction of live attributes
This commit is contained in:
Niels Dossche 2025-03-18 22:03:12 +01:00
commit 2c45d67ad3
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5
3 changed files with 33 additions and 7 deletions

View file

@ -1669,14 +1669,28 @@ PHP_METHOD(Dom_XMLDocument, saveXml)
}
/* }}} end dom_document_savexml */
static void dom_xinclude_strip_references_for_attributes(xmlNodePtr basep)
{
for (xmlAttrPtr prop = basep->properties; prop; prop = prop->next) {
php_libxml_node_free_resource((xmlNodePtr) prop);
for (xmlNodePtr child = prop->children; child; child = child->next) {
php_libxml_node_free_resource(child);
}
}
}
static void dom_xinclude_strip_references(xmlNodePtr basep)
{
php_libxml_node_free_resource(basep);
dom_xinclude_strip_references_for_attributes(basep);
xmlNodePtr current = basep->children;
while (current) {
php_libxml_node_free_resource(current);
if (current->type == XML_ELEMENT_NODE) {
dom_xinclude_strip_references_for_attributes(current);
}
current = php_dom_next_in_tree_order(current, basep);
}
}