archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.1' into PHP-8.2

Browse source 
* PHP-8.1:
  Handle fragments consisting out of multiple children without a single root correctly
This commit is contained in:
Niels Dossche 2023-07-13 16:12:35 +02:00
commit f2ed2b877d
2 changed files with 53 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
ext/dom/parentnode.c
View file

@ -183,15 +183,7 @@ xmlNode* dom_zvals_to_fragment(php_libxml_ref_obj *document, xmlNode *contextNod
goto err; goto err;
} }
if (newNode->type == XML_DOCUMENT_FRAG_NODE) { if (newNode->parent != NULL) {
/* Unpack document fragment nodes, the behaviour differs for different libxml2 versions. */
newNode = newNode->children;
if (UNEXPECTED(newNode == NULL)) {
/* No nodes to add, nothing to do here */
continue;
}
xmlUnlinkNode(newNode);
} else if (newNode->parent != NULL) {
xmlUnlinkNode(newNode); xmlUnlinkNode(newNode);
} }
@ -210,14 +202,23 @@ xmlNode* dom_zvals_to_fragment(php_libxml_ref_obj *document, xmlNode *contextNod
newNode = xmlCopyNode(newNode, 1); newNode = xmlCopyNode(newNode, 1);
} }
if (!xmlAddChild(fragment, newNode)) { if (newNode->type == XML_DOCUMENT_FRAG_NODE) {
/* Unpack document fragment nodes, the behaviour differs for different libxml2 versions. */
newNode = newNode->children;
while (newNode) {
xmlNodePtr next = newNode->next;
xmlUnlinkNode(newNode);
if (!xmlAddChild(fragment, newNode)) {
goto hierarchy_request_err;
}
newNode = next;
}
} else if (!xmlAddChild(fragment, newNode)) {
if (will_free) { if (will_free) {
xmlFreeNode(newNode); xmlFreeNode(newNode);
} }
goto hierarchy_request_err; goto hierarchy_request_err;
} }
continue;
} else { } else {
zend_argument_type_error(i + 1, "must be of type DOMNode|string, %s given", zend_zval_type_name(&nodes[i])); zend_argument_type_error(i + 1, "must be of type DOMNode|string, %s given", zend_zval_type_name(&nodes[i]));
goto err; goto err;
@ -363,14 +364,13 @@ static void dom_pre_insert(xmlNodePtr insertion_point, xmlNodePtr parentNode, xm
/* Place it as last node */ /* Place it as last node */
if (parentNode->children) { if (parentNode->children) {
/* There are children */ /* There are children */
fragment->last->prev = parentNode->last; newchild->prev = parentNode->last;
newchild->prev = parentNode->last->prev;
parentNode->last->next = newchild; parentNode->last->next = newchild;
} else { } else {
/* No children, because they moved out when they became a fragment */ /* No children, because they moved out when they became a fragment */
parentNode->children = newchild; parentNode->children = newchild;
parentNode->last = newchild;
} }
parentNode->last = fragment->last;
} else { } else {
/* Insert fragment before insertion_point */ /* Insert fragment before insertion_point */
fragment->last->next = insertion_point; fragment->last->next = insertion_point;

38
ext/dom/tests/fragments_multiple_nodes_DOMParentNode.phpt Normal file
View file

@ -0,0 +1,38 @@
--TEST--
Handling fragments of multiple nodes for DOMParentNode
--EXTENSIONS--
dom
--FILE--
<?php
$dom = new DOMDocument();
$dom->loadXML('<!DOCTYPE HTML><html><container/></html>');
$container = $dom->documentElement->firstElementChild;
$fragment = $dom->createDocumentFragment();
$fragment->appendChild($dom->createElement('p', '1'));
$fragment->appendChild($dom->createElement('b', '2'));
$container->replaceWith($fragment);
echo $dom->saveXML();
$dom->documentElement->append('foo');
echo $dom->saveXML();
$fragment = $dom->createDocumentFragment();
$fragment->appendChild($dom->createElement('p', '3'));
$fragment->appendChild($dom->createElement('b', '4'));
$dom->documentElement->prepend($fragment);
echo $dom->saveXML();
?>
--EXPECT--
<?xml version="1.0"?>
<!DOCTYPE HTML>
<html><p>1</p><b>2</b></html>
<?xml version="1.0"?>
<!DOCTYPE HTML>
<html><p>1</p><b>2</b>foo</html>
<?xml version="1.0"?>
<!DOCTYPE HTML>
<html><p>3</p><b>4</b><p>1</p><b>2</b>foo</html>