Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix memory leak introduced by fixing bug #78221

1 files changed, 9 insertions, 2 deletions

diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
index 89d1d3bf53..aa01d9db20 100644
--- a/ext/dom/php_dom.c
+++ b/ext/dom/php_dom.c
@@ -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);