Avoid making a redundant copy in php_filter_callback() (#18794)

nielsdos · web-flow · commit cb04226b4aa2 · 2025-06-08T11:23:31.000+02:00
`call_user_function` already makes a copy to the call frame for its
arguments, there's no need to do this ourselves.
diff --git a/ext/filter/callback_filter.c b/ext/filter/callback_filter.c
@@ -19,7 +19,6 @@
 void php_filter_callback(PHP_INPUT_FILTER_PARAM_DECL)
 {
 	zval retval;
-	zval args[1];
 	int status;
 
 	if (!option_array || !zend_is_callable(option_array, IS_CALLABLE_SUPPRESS_DEPRECATIONS, NULL)) {
@@ -29,8 +28,7 @@ void php_filter_callback(PHP_INPUT_FILTER_PARAM_DECL)
 		return;
 	}
 
-	ZVAL_COPY(&args[0], value);
-	status = call_user_function(NULL, NULL, option_array, &retval, 1, args);
+	status = call_user_function(NULL, NULL, option_array, &retval, 1, value);
 
 	if (status == SUCCESS && !Z_ISUNDEF(retval)) {
 		zval_ptr_dtor(value);
@@ -39,6 +37,4 @@ void php_filter_callback(PHP_INPUT_FILTER_PARAM_DECL)
 		zval_ptr_dtor(value);
 		ZVAL_NULL(value);
 	}
-
-	zval_ptr_dtor(&args[0]);
 }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@`
`19`	`19`	`void php_filter_callback(PHP_INPUT_FILTER_PARAM_DECL)`
`20`	`20`	`{`
`21`	`21`	`zval retval;`
`22`		`- zval args[1];`
`23`	`22`	`int status;`
`24`	`23`
`25`	`24`	`if (!option_array \|\| !zend_is_callable(option_array, IS_CALLABLE_SUPPRESS_DEPRECATIONS, NULL)) {`
`@@ -29,8 +28,7 @@ void php_filter_callback(PHP_INPUT_FILTER_PARAM_DECL)`
`29`	`28`	`return;`
`30`	`29`	`}`
`31`	`30`
`32`		`- ZVAL_COPY(&args[0], value);`
`33`		`- status = call_user_function(NULL, NULL, option_array, &retval, 1, args);`
	`31`	`+ status = call_user_function(NULL, NULL, option_array, &retval, 1, value);`
`34`	`32`
`35`	`33`	`if (status == SUCCESS && !Z_ISUNDEF(retval)) {`
`36`	`34`	`zval_ptr_dtor(value);`
`@@ -39,6 +37,4 @@ void php_filter_callback(PHP_INPUT_FILTER_PARAM_DECL)`
`39`	`37`	`zval_ptr_dtor(value);`
`40`	`38`	`ZVAL_NULL(value);`
`41`	`39`	`}`
`42`		`-`
`43`		`- zval_ptr_dtor(&args[0]);`
`44`	`40`	`}`