From 6c9204334f1d4fa127e2cbc211e1ebbdf7e9814c Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Mon, 17 Jul 2023 23:11:45 +0200
Subject: [PATCH] Get rid of some unnecessary string conversion

For typed properties that are of type "string", we don't need to do any
conversion as the zval will already be a string. Removing this
simplifies code and avoids unnecessary refcounting.
---
 ext/dom/attr.c                  |  9 +++------
 ext/dom/characterdata.c         |  9 +++------
 ext/dom/node.c                  | 21 ++++++---------------
 ext/dom/processinginstruction.c |  9 +++------
 4 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/ext/dom/attr.c b/ext/dom/attr.c
index 7e9f512a84bb8..0cbfc2c613054 100644
--- a/ext/dom/attr.c
+++ b/ext/dom/attr.c
@@ -135,7 +135,6 @@ int dom_attr_value_read(dom_object *obj, zval *retval)
 
 int dom_attr_value_write(dom_object *obj, zval *newval)
 {
-	zend_string *str;
 	xmlAttrPtr attrp = (xmlAttrPtr) dom_object_get_node(obj);
 
 	if (attrp == NULL) {
@@ -143,15 +142,13 @@ int dom_attr_value_write(dom_object *obj, zval *newval)
 		return FAILURE;
 	}
 
-	str = zval_try_get_string(newval);
-	if (UNEXPECTED(!str)) {
-		return FAILURE;
-	}
+	/* Typed property, this is already a string */
+	ZEND_ASSERT(Z_TYPE_P(newval) == IS_STRING);
+	zend_string *str = Z_STR_P(newval);
 
 	dom_remove_all_children((xmlNodePtr) attrp);
 	xmlNodeSetContentLen((xmlNodePtr) attrp, (xmlChar *) ZSTR_VAL(str), ZSTR_LEN(str));
 
-	zend_string_release_ex(str, 0);
 	return SUCCESS;
 }
 
diff --git a/ext/dom/characterdata.c b/ext/dom/characterdata.c
index cba6a0a6d71a6..e540b1c55ca9c 100644
--- a/ext/dom/characterdata.c
+++ b/ext/dom/characterdata.c
@@ -52,21 +52,18 @@ int dom_characterdata_data_read(dom_object *obj, zval *retval)
 int dom_characterdata_data_write(dom_object *obj, zval *newval)
 {
 	xmlNode *nodep = dom_object_get_node(obj);
-	zend_string *str;
 
 	if (nodep == NULL) {
 		php_dom_throw_error(INVALID_STATE_ERR, 1);
 		return FAILURE;
 	}
 
-	str = zval_try_get_string(newval);
-	if (UNEXPECTED(!str)) {
-		return FAILURE;
-	}
+	/* Typed property, this is already a string */
+	ZEND_ASSERT(Z_TYPE_P(newval) == IS_STRING);
+	zend_string *str = Z_STR_P(newval);
 
 	xmlNodeSetContentLen(nodep, (xmlChar *) ZSTR_VAL(str), ZSTR_LEN(str));
 
-	zend_string_release_ex(str, 0);
 	return SUCCESS;
 }
 
diff --git a/ext/dom/node.c b/ext/dom/node.c
index e05e51ce4bad7..627f24cb33952 100644
--- a/ext/dom/node.c
+++ b/ext/dom/node.c
@@ -669,10 +669,9 @@ int dom_node_prefix_write(dom_object *obj, zval *newval)
 					nsnode = xmlDocGetRootElement(nodep->doc);
 				}
 			}
-			prefix_str = zval_try_get_string(newval);
-			if (UNEXPECTED(!prefix_str)) {
-				return FAILURE;
-			}
+			/* Typed property, this is already a string */
+			ZEND_ASSERT(Z_TYPE_P(newval) == IS_STRING);
+			prefix_str = Z_STR_P(newval);
 
 			prefix = ZSTR_VAL(prefix_str);
 			if (nsnode && nodep->ns != NULL && !xmlStrEqual(nodep->ns->prefix, (xmlChar *)prefix)) {
@@ -698,14 +697,12 @@ int dom_node_prefix_write(dom_object *obj, zval *newval)
 				}
 
 				if (ns == NULL) {
-					zend_string_release_ex(prefix_str, 0);
 					php_dom_throw_error(NAMESPACE_ERR, dom_get_strict_error(obj->document));
 					return FAILURE;
 				}
 
 				xmlSetNs(nodep, ns);
 			}
-			zend_string_release_ex(prefix_str, 0);
 			break;
 		default:
 			break;
@@ -791,21 +788,17 @@ int dom_node_text_content_read(dom_object *obj, zval *retval)
 int dom_node_text_content_write(dom_object *obj, zval *newval)
 {
 	xmlNode *nodep = dom_object_get_node(obj);
-	zend_string *str;
 
 	if (nodep == NULL) {
 		php_dom_throw_error(INVALID_STATE_ERR, 1);
 		return FAILURE;
 	}
 
-	str = zval_try_get_string(newval);
-	if (UNEXPECTED(!str)) {
-		return FAILURE;
-	}
-
 	php_libxml_invalidate_node_list_cache_from_doc(nodep->doc);
 
-	const xmlChar *xmlChars = (const xmlChar *) ZSTR_VAL(str);
+	/* Typed property, this is already a string */
+	ZEND_ASSERT(Z_TYPE_P(newval) == IS_STRING);
+	const xmlChar *xmlChars = (const xmlChar *) Z_STRVAL_P(newval);
 	int type = nodep->type;
 
 	/* We can't directly call xmlNodeSetContent, because it might encode the string through
@@ -822,8 +815,6 @@ int dom_node_text_content_write(dom_object *obj, zval *newval)
 		xmlNodeSetContent(nodep, xmlChars);
 	}
 
-	zend_string_release_ex(str, 0);
-
 	return SUCCESS;
 }
 
diff --git a/ext/dom/processinginstruction.c b/ext/dom/processinginstruction.c
index 9340217d60954..3fcd082aa229e 100644
--- a/ext/dom/processinginstruction.c
+++ b/ext/dom/processinginstruction.c
@@ -108,23 +108,20 @@ int dom_processinginstruction_data_read(dom_object *obj, zval *retval)
 int dom_processinginstruction_data_write(dom_object *obj, zval *newval)
 {
 	xmlNode *nodep = dom_object_get_node(obj);
-	zend_string *str;
 
 	if (nodep == NULL) {
 		php_dom_throw_error(INVALID_STATE_ERR, 1);
 		return FAILURE;
 	}
 
-	str = zval_try_get_string(newval);
-	if (UNEXPECTED(!str)) {
-		return FAILURE;
-	}
+	/* Typed property, this is already a string */
+	ZEND_ASSERT(Z_TYPE_P(newval) == IS_STRING);
+	zend_string *str = Z_STR_P(newval);
 
 	php_libxml_invalidate_node_list_cache_from_doc(nodep->doc);
 
 	xmlNodeSetContentLen(nodep, (xmlChar *) ZSTR_VAL(str), ZSTR_LEN(str));
 
-	zend_string_release_ex(str, 0);
 	return SUCCESS;
 }