mirror of
https://github.com/php/php-src.git
synced 2024-09-21 18:07:23 +00:00
Fix #78221: DOMNode::normalize() doesn't remove empty text nodes
If a text node is not followed by another text node, we remove it, if its textContent is empty.
This commit is contained in:
parent
656eac74fa
commit
efec22b7be
4
NEWS
4
NEWS
@ -6,6 +6,10 @@ PHP NEWS
|
||||
. Fixed bug #79434 (PHP 7.3 and PHP-7.4 crash with NULL-pointer dereference
|
||||
on !CS constant). (Nikita)
|
||||
|
||||
- DOM:
|
||||
. Fixed bug #78221 (DOMNode::normalize() doesn't remove empty text nodes).
|
||||
(cmb)
|
||||
|
||||
- MBString:
|
||||
. Fixed bug #79441 (Segfault in mb_chr() if internal encoding is unsupported).
|
||||
(Girgias)
|
||||
|
@ -1383,6 +1383,14 @@ void dom_normalize (xmlNodePtr nodep)
|
||||
break;
|
||||
}
|
||||
}
|
||||
strContent = xmlNodeGetContent(child);
|
||||
if (*strContent == '\0') {
|
||||
nextp = child->next;
|
||||
xmlUnlinkNode(child);
|
||||
php_libxml_node_free_resource(child);
|
||||
child = nextp;
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
case XML_ELEMENT_NODE:
|
||||
dom_normalize (child);
|
||||
|
17
ext/dom/tests/bug78221.phpt
Normal file
17
ext/dom/tests/bug78221.phpt
Normal file
@ -0,0 +1,17 @@
|
||||
--TEST--
|
||||
Bug #78221 (DOMNode::normalize() doesn't remove empty text nodes)
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (!extension_loaded('dom')) die('skip dom extension not available');
|
||||
?>
|
||||
--FILE--
|
||||
<?php
|
||||
$doc = new DOMDocument();
|
||||
$doc->loadHTML('<p id=x>foo</p>');
|
||||
$p = $doc->getElementById('x');
|
||||
$p->childNodes[0]->textContent = '';
|
||||
$p->normalize();
|
||||
var_dump($p->childNodes->length);
|
||||
?>
|
||||
--EXPECT--
|
||||
int(0)
|
Loading…
Reference in New Issue
Block a user