Skip to content

Add missing hierarchy checks to replaceChild #16377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Add missing hierarchy checks to replaceChild #16377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 5 additions & 17 deletions ext/dom/node.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,7 +843,7 @@ static xmlNodePtr _php_dom_insert_fragment(xmlNodePtr nodep, xmlNodePtr prevsib,
}
/* }}} */

static bool dom_node_check_legacy_insertion_validity(xmlNodePtr parentp, xmlNodePtr child, bool stricterror)
static bool dom_node_check_legacy_insertion_validity(xmlNodePtr parentp, xmlNodePtr child, bool stricterror, bool warn_empty_fragment)
{
if (dom_node_is_read_only(parentp) == SUCCESS ||
(child->parent != NULL && dom_node_is_read_only(child->parent) == SUCCESS)) {
Expand All @@ -861,7 +861,7 @@ static bool dom_node_check_legacy_insertion_validity(xmlNodePtr parentp, xmlNode
return false;
}

if (child->type == XML_DOCUMENT_FRAG_NODE && child->children == NULL) {
if (warn_empty_fragment && child->type == XML_DOCUMENT_FRAG_NODE && child->children == NULL) {
/* TODO Drop Warning? */
php_error_docref(NULL, E_WARNING, "Document Fragment is empty");
return false;
Expand Down Expand Up @@ -903,7 +903,7 @@ PHP_METHOD(DOMNode, insertBefore)

stricterror = dom_get_strict_error(intern->document);

if (!dom_node_check_legacy_insertion_validity(parentp, child, stricterror)) {
if (!dom_node_check_legacy_insertion_validity(parentp, child, stricterror, true)) {
RETURN_FALSE;
}

Expand Down Expand Up @@ -1066,19 +1066,7 @@ PHP_METHOD(DOMNode, replaceChild)

stricterror = dom_get_strict_error(intern->document);

if (dom_node_is_read_only(nodep) == SUCCESS ||
(newchild->parent != NULL && dom_node_is_read_only(newchild->parent) == SUCCESS)) {
php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, stricterror);
RETURN_FALSE;
}

if (newchild->doc != nodep->doc && newchild->doc != NULL) {
php_dom_throw_error(WRONG_DOCUMENT_ERR, stricterror);
RETURN_FALSE;
}

if (dom_hierarchy(nodep, newchild) == FAILURE) {
php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror);
if (!dom_node_check_legacy_insertion_validity(nodep, newchild, stricterror, false)) {
RETURN_FALSE;
}

Expand Down Expand Up @@ -1185,7 +1173,7 @@ PHP_METHOD(DOMNode, appendChild)

stricterror = dom_get_strict_error(intern->document);

if (!dom_node_check_legacy_insertion_validity(nodep, child, stricterror)) {
if (!dom_node_check_legacy_insertion_validity(nodep, child, stricterror, true)) {
RETURN_FALSE;
}

Expand Down
27 changes: 27 additions & 0 deletions ext/dom/tests/replaceChild_attribute_validation.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
--TEST--
replaceChild with attribute children
--EXTENSIONS--
dom
--FILE--
<?php

$dom = new DOMDocument;
$attr = $dom->createAttribute('attr');
$attr->textContent = "test";

try {
$attr->replaceChild($dom->createProcessingInstruction('pi'), $attr->firstChild);
} catch (DOMException $e) {
echo $e->getMessage(), "\n";
}

$root = $dom->appendChild($dom->createElement('root'));
$root->setAttributeNode($attr);

echo $dom->saveXML();

?>
--EXPECT--
Hierarchy Request Error
<?xml version="1.0"?>
<root attr="test"/>
Loading