Skip to content

Fix the node that cannot be removed permanently #9619

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 3 commits into from
Closed

Fix the node that cannot be removed permanently #9619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f684daf
fix the node cannot be removed permanently
NathanFreeman Sep 27, 2022
57c9e39
echo xml
NathanFreeman Sep 27, 2022
ba9269f
rename test
NathanFreeman Sep 28, 2022
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
13 changes: 8 additions & 5 deletions ext/dom/node.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1129,6 +1129,9 @@ PHP_METHOD(DOMNode, removeChild)

while (children) {
if (children == child) {
if ((child->properties != NULL) && (child->doc != NULL) && child->properties->atype == XML_ATTRIBUTE_ID) {
xmlRemoveID(child->doc, child->properties);
}
xmlUnlinkNode(child);
DOM_RET_OBJ(child, &ret, intern);
return;
Expand Down Expand Up @@ -1678,7 +1681,7 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{
buf = xmlAllocOutputBuffer(NULL);
}

if (buf != NULL) {
if (buf != NULL) {
ret = xmlC14NDocSaveTo(docp, nodeset, exclusive, inclusive_ns_prefixes,
with_comments, buf);
}
Expand All @@ -1693,9 +1696,9 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{
xmlXPathFreeContext(ctxp);
}

if (buf == NULL || ret < 0) {
RETVAL_FALSE;
} else {
if (buf == NULL || ret < 0) {
RETVAL_FALSE;
} else {
if (mode == 0) {
#ifdef LIBXML2_NEW_BUFFER
ret = xmlOutputBufferGetSize(buf);
Expand All @@ -1712,7 +1715,7 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{
RETVAL_EMPTY_STRING();
}
}
}
}

if (buf) {
int bytes;
Expand Down
128 changes: 128 additions & 0 deletions ext/dom/tests/removeChild_permanently.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
--TEST--
DOMDocument::removeChild: The node that cannot be removed permanently
--SKIPIF--
<?php require_once('skipif.inc'); ?>
--FILE--
<?php
$dom = new DOMDocument();
$root = $dom->createElement('html');
$dom->appendChild($root);

$el1 = $dom->createElement('p1');
$el1->setAttribute('id', 'foo');
$el1->setIdAttribute('id', true);

$root->appendChild($el1);

$el2 = $dom->createElement('p2');
$el2->setAttribute('id', 'bar');
$el2->setIdAttribute('id', true);

$root->appendChild($el2);

var_dump($dom->getElementById('foo'));
$root->removeChild($dom->getElementById('foo'));
var_dump($dom->getElementById('bar'));
var_dump($dom->getElementById('foo'));
echo $dom->saveXML();
?>
--EXPECTF--
object(DOMElement)#%d (%d) {
["tagName"]=>
string(2) "p1"
["schemaTypeInfo"]=>
NULL
["firstElementChild"]=>
NULL
["lastElementChild"]=>
NULL
["childElementCount"]=>
int(0)
["previousElementSibling"]=>
NULL
["nextElementSibling"]=>
string(22) "(object value omitted)"
["nodeName"]=>
string(2) "p1"
["nodeValue"]=>
string(0) ""
["nodeType"]=>
int(1)
["parentNode"]=>
string(22) "(object value omitted)"
["childNodes"]=>
string(22) "(object value omitted)"
["firstChild"]=>
NULL
["lastChild"]=>
NULL
["previousSibling"]=>
NULL
["nextSibling"]=>
string(22) "(object value omitted)"
["attributes"]=>
string(22) "(object value omitted)"
["ownerDocument"]=>
string(22) "(object value omitted)"
["namespaceURI"]=>
NULL
["prefix"]=>
string(0) ""
["localName"]=>
string(2) "p1"
["baseURI"]=>
NULL
["textContent"]=>
string(0) ""
}
object(DOMElement)#%d (%d) {
["tagName"]=>
string(2) "p2"
["schemaTypeInfo"]=>
NULL
["firstElementChild"]=>
NULL
["lastElementChild"]=>
NULL
["childElementCount"]=>
int(0)
["previousElementSibling"]=>
NULL
["nextElementSibling"]=>
NULL
["nodeName"]=>
string(2) "p2"
["nodeValue"]=>
string(0) ""
["nodeType"]=>
int(1)
["parentNode"]=>
string(22) "(object value omitted)"
["childNodes"]=>
string(22) "(object value omitted)"
["firstChild"]=>
NULL
["lastChild"]=>
NULL
["previousSibling"]=>
NULL
["nextSibling"]=>
NULL
["attributes"]=>
string(22) "(object value omitted)"
["ownerDocument"]=>
string(22) "(object value omitted)"
["namespaceURI"]=>
NULL
["prefix"]=>
string(0) ""
["localName"]=>
string(2) "p2"
["baseURI"]=>
NULL
["textContent"]=>
string(0) ""
}
NULL
<?xml version="1.0"?>
<html><p2 id="bar"/></html>