Merge branch 'PHP-8.4' into PHP-8.5

TimWolla · TimWolla · commit 5f989aaef2cd · 2026-04-23T19:22:53.000+02:00
* PHP-8.4: zend_compile: Fix incorrect use of `ZVAL_NEW_STR()` in `zend_compile_call()` (php#21851)
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -5221,7 +5221,7 @@ static void zend_compile_call(znode *result, zend_ast *ast, uint32_t type) /* {{
 		}
 
 		zval_ptr_dtor(&name_node.u.constant);
-		ZVAL_NEW_STR(&name_node.u.constant, lcname);
+		ZVAL_STR(&name_node.u.constant, lcname);
 
 		opline = zend_emit_op(NULL, ZEND_INIT_FCALL, NULL, &name_node);
 		opline->result.num = zend_alloc_cache_slot();

Original file line number	Diff line number	Diff line change
`@@ -5221,7 +5221,7 @@ static void zend_compile_call(znode result, zend_ast ast, uint32_t type) /* {{`
`5221`	`5221`	`}`
`5222`	`5222`
`5223`	`5223`	`zval_ptr_dtor(&name_node.u.constant);`
`5224`		`- ZVAL_NEW_STR(&name_node.u.constant, lcname);`
	`5224`	`+ ZVAL_STR(&name_node.u.constant, lcname);`
`5225`	`5225`
`5226`	`5226`	`opline = zend_emit_op(NULL, ZEND_INIT_FCALL, NULL, &name_node);`
`5227`	`5227`	`opline->result.num = zend_alloc_cache_slot();`