diff options
Diffstat (limited to 'src/sp_disabled_functions.c')
| -rw-r--r-- | src/sp_disabled_functions.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/sp_disabled_functions.c b/src/sp_disabled_functions.c index f8c21d2..eb0ba83 100644 --- a/src/sp_disabled_functions.c +++ b/src/sp_disabled_functions.c | |||
| @@ -258,8 +258,8 @@ bool should_disable(zend_execute_data* execute_data, const char* builtin_name, | |||
| 258 | goto next; | 258 | goto next; |
| 259 | } | 259 | } |
| 260 | } else if (config_node->r_function) { | 260 | } else if (config_node->r_function) { |
| 261 | if (false == | 261 | if (false == sp_is_regexp_matching(config_node->r_function, |
| 262 | sp_is_regexp_matching(config_node->r_function, complete_path_function)) { | 262 | complete_path_function)) { |
| 263 | goto next; | 263 | goto next; |
| 264 | } | 264 | } |
| 265 | } | 265 | } |
| @@ -365,8 +365,8 @@ bool should_drop_on_ret(zval* return_value, | |||
| 365 | goto next; | 365 | goto next; |
| 366 | } | 366 | } |
| 367 | } else if (config_node->r_function) { | 367 | } else if (config_node->r_function) { |
| 368 | if (false == | 368 | if (false == sp_is_regexp_matching(config_node->r_function, |
| 369 | sp_is_regexp_matching(config_node->r_function, complete_path_function)) { | 369 | complete_path_function)) { |
| 370 | goto next; | 370 | goto next; |
| 371 | } | 371 | } |
| 372 | } | 372 | } |
| @@ -445,10 +445,10 @@ static int hook_functions(const sp_list_node* config) { | |||
| 445 | 445 | ||
| 446 | if (NULL != function_name) { // hook function by name | 446 | if (NULL != function_name) { // hook function by name |
| 447 | HOOK_FUNCTION(function_name, disabled_functions_hook, | 447 | HOOK_FUNCTION(function_name, disabled_functions_hook, |
| 448 | PHP_FN(check_disabled_function), false); | 448 | PHP_FN(check_disabled_function)); |
| 449 | } else if (NULL != function_name_regexp) { // hook function by regexp | 449 | } else if (NULL != function_name_regexp) { // hook function by regexp |
| 450 | HOOK_FUNCTION_BY_REGEXP(function_name_regexp, disabled_functions_hook, | 450 | HOOK_FUNCTION_BY_REGEXP(function_name_regexp, disabled_functions_hook, |
| 451 | PHP_FN(check_disabled_function), false); | 451 | PHP_FN(check_disabled_function)); |
| 452 | } else { | 452 | } else { |
| 453 | return FAILURE; | 453 | return FAILURE; |
| 454 | } | 454 | } |
| @@ -505,7 +505,7 @@ int hook_disabled_functions(void) { | |||
| 505 | while (it) { | 505 | while (it) { |
| 506 | hook_function((char*)it->data, | 506 | hook_function((char*)it->data, |
| 507 | SNUFFLEUPAGUS_G(sp_eval_blacklist_functions_hook), | 507 | SNUFFLEUPAGUS_G(sp_eval_blacklist_functions_hook), |
| 508 | PHP_FN(eval_blacklist_callback), false); | 508 | PHP_FN(eval_blacklist_callback)); |
| 509 | it = it->next; | 509 | it = it->next; |
| 510 | } | 510 | } |
| 511 | } | 511 | } |
