Drop useless allocation in php_filter_callback

nikic · nikic · commit 3f8ceb6f0589 · 2017-07-04T21:11:22.000+02:00
diff --git a/ext/filter/callback_filter.c b/ext/filter/callback_filter.c
@@ -23,7 +23,7 @@
 void php_filter_callback(PHP_INPUT_FILTER_PARAM_DECL)
 {
 	zval retval;
-	zval *args;
+	zval args[1];
 	int status;
 
 	if (!option_array || !zend_is_callable(option_array, IS_CALLABLE_CHECK_NO_ACCESS, NULL)) {
@@ -33,7 +33,6 @@ void php_filter_callback(PHP_INPUT_FILTER_PARAM_DECL)
 		return;
 	}
 
-	args = safe_emalloc(sizeof(zval), 1, 0);
 	ZVAL_COPY(&args[0], value);
 	status = call_user_function_ex(EG(function_table), NULL, option_array, &retval, 1, args, 0, NULL);
 
@@ -46,7 +45,6 @@ void php_filter_callback(PHP_INPUT_FILTER_PARAM_DECL)
 	}
 
 	zval_ptr_dtor(&args[0]);
-	efree(args);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`void php_filter_callback(PHP_INPUT_FILTER_PARAM_DECL)`
`24`	`24`	`{`
`25`	`25`	`zval retval;`
`26`		`- zval *args;`
	`26`	`+ zval args[1];`
`27`	`27`	`int status;`
`28`	`28`
`29`	`29`	`if (!option_array \|\| !zend_is_callable(option_array, IS_CALLABLE_CHECK_NO_ACCESS, NULL)) {`
`@@ -33,7 +33,6 @@ void php_filter_callback(PHP_INPUT_FILTER_PARAM_DECL)`
`33`	`33`	`return;`
`34`	`34`	`}`
`35`	`35`
`36`		`- args = safe_emalloc(sizeof(zval), 1, 0);`
`37`	`36`	`ZVAL_COPY(&args[0], value);`
`38`	`37`	`status = call_user_function_ex(EG(function_table), NULL, option_array, &retval, 1, args, 0, NULL);`
`39`	`38`
`@@ -46,7 +45,6 @@ void php_filter_callback(PHP_INPUT_FILTER_PARAM_DECL)`
`46`	`45`	`}`
`47`	`46`
`48`	`47`	`zval_ptr_dtor(&args[0]);`
`49`		`- efree(args);`
`50`	`48`	`}`
`51`	`49`
`52`	`50`	`/*`