Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion ext/dom/node.c
Original file line number Diff line number Diff line change
Expand Up @@ -931,6 +931,9 @@ static void dom_node_insert_before_legacy(zval *return_value, zval *ref, dom_obj
php_dom_throw_error(NOT_FOUND_ERR, stricterror);
RETURN_FALSE;
}
if (refp == child) {
refp = child->next;
}
}

if (child->doc == NULL && parentp->doc != NULL) {
Expand All @@ -940,7 +943,7 @@ static void dom_node_insert_before_legacy(zval *return_value, zval *ref, dom_obj

php_libxml_invalidate_node_list_cache(intern->document);

if (ref != NULL) {
if (refp != NULL) {
if (child->parent != NULL) {
xmlUnlinkNode(child);
}
Expand Down
53 changes: 53 additions & 0 deletions ext/dom/tests/gh23365.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
--TEST--
GH-23365 (DOMNode::insertBefore($n, $n) drops the node and leaves a self-referencing sibling list)
--CREDITS--
Alexandre Daubois
--EXTENSIONS--
dom
--FILE--
<?php
$doc = new DOMDocument();
$doc->loadXML('<root>text<child/></root>');
$root = $doc->documentElement;

$text = $root->firstChild;
var_dump($root->insertBefore($text, $text) === $text);
var_dump($root->childNodes->length);
var_dump($text->parentNode === $root, $text->nextSibling === $text, $text->previousSibling === $text);

$child = $root->lastChild;
var_dump($root->insertBefore($child, $child) === $child);
var_dump($root->childNodes->length);

echo $doc->saveXML($root), PHP_EOL;

$doc2 = new DOMDocument();
$doc2->loadXML('<root a="1" b="2"/>');
$el = $doc2->documentElement;
$attr = $el->getAttributeNode('a');
var_dump($el->insertBefore($attr, $attr) === $attr);
echo $doc2->saveXML($el), PHP_EOL;

$doc3 = new DOMDocument();
$root3 = $doc3->appendChild($doc3->createElement('root'));
$root3->appendChild($doc3->createTextNode('A'));
$t = $root3->appendChild($doc3->createTextNode('B'));
$root3->insertBefore($t, $t);
$root3->appendChild($t);
echo $doc3->saveXML($root3), PHP_EOL;
unset($t, $root3, $doc3);
echo "done", PHP_EOL;
?>
--EXPECT--
bool(true)
int(2)
bool(true)
bool(false)
bool(false)
bool(true)
int(2)
<root>text<child/></root>
bool(true)
<root a="1" b="2"/>
<root>AB</root>
done
Loading