From 86721d3ef47184c0709ef96af85feffe6623923e Mon Sep 17 00:00:00 2001
From: ndossche <7771979+ndossche@users.noreply.github.com>
Date: Wed, 11 Mar 2026 23:30:02 +0100
Subject: [PATCH 1/2] dom: Simplify return value management of xpath callback

---
 ext/dom/xpath_callbacks.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/ext/dom/xpath_callbacks.c b/ext/dom/xpath_callbacks.c
index 0974db475b3a9..2115bc3df41f0 100644
--- a/ext/dom/xpath_callbacks.c
+++ b/ext/dom/xpath_callbacks.c
@@ -435,7 +435,6 @@ static zend_result php_dom_xpath_callback_dispatch(php_dom_xpath_callbacks *xpat
 			if (xpath_callbacks->node_list == NULL) {
 				xpath_callbacks->node_list = zend_new_array(0);
 			}
-			Z_ADDREF_P(&callback_retval);
 			zend_hash_next_index_insert_new(xpath_callbacks->node_list, &callback_retval);
 			obj = Z_DOMOBJ_P(&callback_retval);
 			nodep = dom_object_get_node(obj);
@@ -447,12 +446,10 @@ static zend_result php_dom_xpath_callback_dispatch(php_dom_xpath_callbacks *xpat
 			zval_ptr_dtor(&callback_retval);
 			return FAILURE;
 		} else {
-			zend_string *tmp_str;
-			zend_string *str = zval_get_tmp_string(&callback_retval, &tmp_str);
-			valuePush(ctxt, xmlXPathNewString(BAD_CAST ZSTR_VAL(str)));
-			zend_tmp_string_release(tmp_str);
+			convert_to_string(&callback_retval);
+			valuePush(ctxt, xmlXPathNewString(BAD_CAST Z_STRVAL(callback_retval)));
+			zval_ptr_dtor_str(&callback_retval);
 		}
-		zval_ptr_dtor(&callback_retval);
 	}
 
 	return SUCCESS;

From e3e9d289f3ec67b55c03776dbcc6fa5a485c6d5a Mon Sep 17 00:00:00 2001
From: ndossche <7771979+ndossche@users.noreply.github.com>
Date: Wed, 11 Mar 2026 23:30:39 +0100
Subject: [PATCH 2/2] dom: Merge declaration and assignment

---
 ext/dom/xpath_callbacks.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ext/dom/xpath_callbacks.c b/ext/dom/xpath_callbacks.c
index 2115bc3df41f0..816c925435aea 100644
--- a/ext/dom/xpath_callbacks.c
+++ b/ext/dom/xpath_callbacks.c
@@ -430,14 +430,12 @@ static zend_result php_dom_xpath_callback_dispatch(php_dom_xpath_callbacks *xpat
 	if (Z_TYPE(callback_retval) != IS_UNDEF) {
 		if (Z_TYPE(callback_retval) == IS_OBJECT
 		 && (instanceof_function(Z_OBJCE(callback_retval), dom_get_node_ce(php_dom_follow_spec_node((const xmlNode *) ctxt->context->doc))))) {
-			xmlNode *nodep;
-			dom_object *obj;
 			if (xpath_callbacks->node_list == NULL) {
 				xpath_callbacks->node_list = zend_new_array(0);
 			}
 			zend_hash_next_index_insert_new(xpath_callbacks->node_list, &callback_retval);
-			obj = Z_DOMOBJ_P(&callback_retval);
-			nodep = dom_object_get_node(obj);
+			dom_object *obj = Z_DOMOBJ_P(&callback_retval);
+			xmlNodePtr nodep = dom_object_get_node(obj);
 			valuePush(ctxt, xmlXPathNewNodeSet(nodep));
 		} else if (Z_TYPE(callback_retval) == IS_FALSE || Z_TYPE(callback_retval) == IS_TRUE) {
 			valuePush(ctxt, xmlXPathNewBoolean(Z_TYPE(callback_retval) == IS_TRUE));