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

Merge branch 'PHP-7.4'

Browse Source 
* PHP-7.4:
  Fix memory leak introduced by fixing bug #78221
This commit is contained in:
Christoph M. Becker
2020-04-08 10:37:28 +02:00
parent cb338d8c4e c3ee9d1bb7
commit d4f9d54f1a
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/dom/php_dom.c
+9 -2
View File
@@ -1301,6 +1301,14 @@ xmlNode *dom_get_elements_by_tag_name_ns_raw(xmlNodePtr nodep, char *ns, char *l
/* }}} */
/* }}} end dom_element_get_elements_by_tag_name_ns_raw */
static inline zend_bool is_empty_node(xmlNodePtr nodep)
{
xmlChar *strContent = xmlNodeGetContent(nodep);
zend_bool ret = strContent == NULL || *strContent == '\0';
xmlFree(strContent);
return ret;
}
/* {{{ void dom_normalize (xmlNodePtr nodep) */
void dom_normalize (xmlNodePtr nodep)
{
@@ -1326,8 +1334,7 @@ void dom_normalize (xmlNodePtr nodep)
break;
}
}
strContent = xmlNodeGetContent(child);
if (*strContent == '\0') {
if (is_empty_node(child)) {
nextp = child->next;
xmlUnlinkNode(child);
php_libxml_node_free_resource(child);