php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

ext/filter: Check callback validity once (#19921)

Browse Source 
The call_user_function() API redoes the zend_is_callable() check, which has been just done.

We can check validity and retrieve the FCC to call it directly rather than having a useless double check
This commit is contained in:
Gina Peter Banyard
2025-09-30 15:17:56 +01:00
committed by GitHub
parent 44714a3254
commit c7da728574
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ext/filter/callback_filter.c
View File

@@ -19,22 +19,21 @@
zend_result php_filter_callback(PHP_INPUT_FILTER_PARAM_DECL)
{
zval retval;
int status;
zend_fcall_info_cache fcc;
if (!option_array || !zend_is_callable(option_array, IS_CALLABLE_SUPPRESS_DEPRECATIONS, NULL)) {
if (!option_array || !zend_is_callable_ex(option_array, NULL, IS_CALLABLE_SUPPRESS_DEPRECATIONS, NULL, &fcc, NULL)) {
zend_type_error("%s(): Option must be a valid callback", get_active_function_name());
zval_ptr_dtor(value);
ZVAL_NULL(value);
return SUCCESS;
}
status = call_user_function(NULL, NULL, option_array, &retval, 1, value);
zend_call_known_fcc(&fcc, &retval, 1, value, NULL);
zval_ptr_dtor(value);
if (status == SUCCESS && !Z_ISUNDEF(retval)) {
zval_ptr_dtor(value);
if (!Z_ISUNDEF(retval)) {
ZVAL_COPY_VALUE(value, &retval);
} else {
zval_ptr_dtor(value);
ZVAL_NULL(value);
}
return SUCCESS;