From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 25 Aug 2020 09:01:22 +0000 (+0200)
Subject: Simplify change_node_zval implementation
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=afde6dcf5f3c82aa4a03f1acdd0a17daa6bc644a;p=php

Simplify change_node_zval implementation

At this point, the value has already been converted into a string.
---

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index afd655aeed..42a7ccb192 100644
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -377,31 +377,12 @@ static zval *sxe_dimension_read(zend_object *object, zval *offset, int type, zva
 static void change_node_zval(xmlNodePtr node, zval *value)
 {
 	xmlChar *buffer;
-
-	if (!value)
-	{
-		xmlNodeSetContentLen(node, (xmlChar *)"", 0);
-		return;
-	}
-	switch (Z_TYPE_P(value)) {
-		case IS_LONG:
-		case IS_FALSE:
-		case IS_TRUE:
-		case IS_DOUBLE:
-		case IS_NULL:
-			convert_to_string(value);
-			/* break missing intentionally */
-		case IS_STRING:
-			buffer = xmlEncodeEntitiesReentrant(node->doc, (xmlChar *)Z_STRVAL_P(value));
-			/* check for NULL buffer in case of memory error in xmlEncodeEntitiesReentrant */
-			if (buffer) {
-				xmlNodeSetContent(node, buffer);
-				xmlFree(buffer);
-			}
-			break;
-		default:
-			php_error_docref(NULL, E_WARNING, "It is not possible to assign complex types to nodes");
-			break;
+	ZEND_ASSERT(Z_TYPE_P(value) == IS_STRING);
+	buffer = xmlEncodeEntitiesReentrant(node->doc, (xmlChar *)Z_STRVAL_P(value));
+	/* check for NULL buffer in case of memory error in xmlEncodeEntitiesReentrant */
+	if (buffer) {
+		xmlNodeSetContent(node, buffer);
+		xmlFree(buffer);
 	}
 }
 /* }}} */