php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-10 17:43:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.4'

Browse Source 
* PHP-7.4:
  Fix #78221: DOMNode::normalize() doesn't remove empty text nodes
This commit is contained in:
Christoph M. Becker
2020-04-07 13:09:10 +02:00
parent 864b1cc3ef 13c9572a79
commit 68139dbdd8
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ext/dom/php_dom.c
View File

@@ -1326,6 +1326,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
View 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)