diff options
Diffstat (limited to 'src/sp_disabled_functions.c')
| -rw-r--r-- | src/sp_disabled_functions.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/sp_disabled_functions.c b/src/sp_disabled_functions.c index 8396cae..f8c21d2 100644 --- a/src/sp_disabled_functions.c +++ b/src/sp_disabled_functions.c | |||
| @@ -155,7 +155,7 @@ static bool is_param_matching(zend_execute_data* execute_data, | |||
| 155 | } | 155 | } |
| 156 | const bool pcre_matching = | 156 | const bool pcre_matching = |
| 157 | config_node->r_param && | 157 | config_node->r_param && |
| 158 | (true == is_regexp_matching(config_node->r_param, *arg_name)); | 158 | (true == sp_is_regexp_matching(config_node->r_param, *arg_name)); |
| 159 | 159 | ||
| 160 | /* This is the parameter name we're looking for. */ | 160 | /* This is the parameter name we're looking for. */ |
| 161 | if (true == pcre_matching || config_node->pos != -1) { | 161 | if (true == pcre_matching || config_node->pos != -1) { |
| @@ -259,7 +259,7 @@ bool should_disable(zend_execute_data* execute_data, const char* builtin_name, | |||
| 259 | } | 259 | } |
| 260 | } else if (config_node->r_function) { | 260 | } else if (config_node->r_function) { |
| 261 | if (false == | 261 | if (false == |
| 262 | is_regexp_matching(config_node->r_function, complete_path_function)) { | 262 | sp_is_regexp_matching(config_node->r_function, complete_path_function)) { |
| 263 | goto next; | 263 | goto next; |
| 264 | } | 264 | } |
| 265 | } | 265 | } |
| @@ -276,7 +276,7 @@ bool should_disable(zend_execute_data* execute_data, const char* builtin_name, | |||
| 276 | } | 276 | } |
| 277 | } else if (config_node->r_filename) { | 277 | } else if (config_node->r_filename) { |
| 278 | if (false == | 278 | if (false == |
| 279 | is_regexp_matching(config_node->r_filename, current_filename)) { | 279 | sp_is_regexp_matching(config_node->r_filename, current_filename)) { |
| 280 | goto next; | 280 | goto next; |
| 281 | } | 281 | } |
| 282 | } | 282 | } |
| @@ -366,7 +366,7 @@ bool should_drop_on_ret(zval* return_value, | |||
| 366 | } | 366 | } |
| 367 | } else if (config_node->r_function) { | 367 | } else if (config_node->r_function) { |
| 368 | if (false == | 368 | if (false == |
| 369 | is_regexp_matching(config_node->r_function, complete_path_function)) { | 369 | sp_is_regexp_matching(config_node->r_function, complete_path_function)) { |
| 370 | goto next; | 370 | goto next; |
| 371 | } | 371 | } |
| 372 | } | 372 | } |
| @@ -377,7 +377,7 @@ bool should_drop_on_ret(zval* return_value, | |||
| 377 | } | 377 | } |
| 378 | } else if (config_node->r_filename) { | 378 | } else if (config_node->r_filename) { |
| 379 | if (false == | 379 | if (false == |
| 380 | is_regexp_matching(config_node->r_filename, current_filename)) { | 380 | sp_is_regexp_matching(config_node->r_filename, current_filename)) { |
| 381 | goto next; | 381 | goto next; |
| 382 | } | 382 | } |
| 383 | } | 383 | } |
| @@ -440,7 +440,7 @@ ZEND_FUNCTION(check_disabled_function) { | |||
| 440 | static int hook_functions(const sp_list_node* config) { | 440 | static int hook_functions(const sp_list_node* config) { |
| 441 | while (config && config->data) { | 441 | while (config && config->data) { |
| 442 | const char* function_name = ((sp_disabled_function*)config->data)->function; | 442 | const char* function_name = ((sp_disabled_function*)config->data)->function; |
| 443 | const pcre* function_name_regexp = | 443 | const sp_pcre* function_name_regexp = |
| 444 | ((sp_disabled_function*)config->data)->r_function; | 444 | ((sp_disabled_function*)config->data)->r_function; |
| 445 | 445 | ||
| 446 | if (NULL != function_name) { // hook function by name | 446 | if (NULL != function_name) { // hook function by name |
