simplexml: Avoid double lookups and unnecessary allocations in getNamespaces() (#20447)

ndossche · web-flow · commit 08ba240c8181 · 2025-11-11T11:19:29.000+01:00
diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
@@ -1413,14 +1413,10 @@ PHP_METHOD(SimpleXMLElement, asXML)
 
 static inline void sxe_add_namespace_name_raw(zval *return_value, const char *prefix, const char *href)
 {
-	zend_string *key = zend_string_init(prefix, strlen(prefix), 0);
-	zval zv;
-
-	if (!zend_hash_exists(Z_ARRVAL_P(return_value), key)) {
-		ZVAL_STRING(&zv, href);
-		zend_hash_add_new(Z_ARRVAL_P(return_value), key, &zv);
+	zval *zv = zend_hash_str_lookup(Z_ARRVAL_P(return_value), prefix, strlen(prefix));
+	if (Z_ISNULL_P(zv)) {
+		ZVAL_STRING(zv, href);
 	}
-	zend_string_release_ex(key, 0);
 }
 
 static inline void sxe_add_namespace_name(zval *return_value, xmlNsPtr ns) /* {{{ */

Original file line number	Diff line number	Diff line change
`@@ -1413,14 +1413,10 @@ PHP_METHOD(SimpleXMLElement, asXML)`
`1413`	`1413`
`1414`	`1414`	`static inline void sxe_add_namespace_name_raw(zval return_value, const char prefix, const char *href)`
`1415`	`1415`	`{`
`1416`		`- zend_string *key = zend_string_init(prefix, strlen(prefix), 0);`
`1417`		`- zval zv;`
`1418`		`-`
`1419`		`- if (!zend_hash_exists(Z_ARRVAL_P(return_value), key)) {`
`1420`		`- ZVAL_STRING(&zv, href);`
`1421`		`- zend_hash_add_new(Z_ARRVAL_P(return_value), key, &zv);`
	`1416`	`+ zval *zv = zend_hash_str_lookup(Z_ARRVAL_P(return_value), prefix, strlen(prefix));`
	`1417`	`+ if (Z_ISNULL_P(zv)) {`
	`1418`	`+ ZVAL_STRING(zv, href);`
`1422`	`1419`	`}`
`1423`		`- zend_string_release_ex(key, 0);`
`1424`	`1420`	`}`
`1425`	`1421`
`1426`	`1422`	`static inline void sxe_add_namespace_name(zval return_value, xmlNsPtr ns) / {{{ */`