diff options
| author | Ben Fuhrmannek | 2020-06-15 11:51:16 +0200 |
|---|---|---|
| committer | Ben Fuhrmannek | 2020-06-15 11:51:16 +0200 |
| commit | 7ac1e3866ef4f146c6c93a5ca13b9aebb14e936a (patch) | |
| tree | ce57745314d905ff06119788acb56c11dcb3aede /src/sp_disabled_functions.c | |
| parent | f742d9f88bf788e38bbe832f1b75e39784f024bc (diff) | |
| parent | 7f9602ebc23582195d63eb35f1de1961297f2e00 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/sp_disabled_functions.c')
| -rw-r--r-- | src/sp_disabled_functions.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/sp_disabled_functions.c b/src/sp_disabled_functions.c index 5daf068..6cb5446 100644 --- a/src/sp_disabled_functions.c +++ b/src/sp_disabled_functions.c | |||
| @@ -356,11 +356,16 @@ static void should_disable(zend_execute_data* execute_data, | |||
| 356 | (config_node->pos != -1) || | 356 | (config_node->pos != -1) || |
| 357 | ((config_node->r_value || config_node->value) && !config_node->var)) { | 357 | ((config_node->r_value || config_node->value) && !config_node->var)) { |
| 358 | if (!builtin_param && | 358 | if (!builtin_param && |
| 359 | execute_data->func->op_array.arg_info->is_variadic) { | 359 | #if PHP_VERSION_ID >= 80000 |
| 360 | ZEND_ARG_IS_VARIADIC(execute_data->func->op_array.arg_info) | ||
| 361 | #else | ||
| 362 | execute_data->func->op_array.arg_info->is_variadic | ||
| 363 | #endif | ||
| 364 | ){ | ||
| 360 | sp_log_warn( | 365 | sp_log_warn( |
| 361 | "disable_function", | 366 | "disable_function", |
| 362 | "Snuffleupagus doesn't support variadic functions yet, sorry. " | 367 | "Snuffleupagus doesn't support variadic functions yet, sorry. " |
| 363 | "Check https://github.com/nbs-system/snuffleupagus/issues/164 for " | 368 | "Check https://github.com/jvoisin/snuffleupagus/issues/164 for " |
| 364 | "details."); | 369 | "details."); |
| 365 | } else if (false == is_param_matching( | 370 | } else if (false == is_param_matching( |
| 366 | execute_data, config_node, builtin_param, builtin_param_name, | 371 | execute_data, config_node, builtin_param, builtin_param_name, |
