diff options
| author | jvoisin | 2018-01-12 17:41:45 +0100 |
|---|---|---|
| committer | jvoisin | 2018-01-12 17:41:45 +0100 |
| commit | f6f1c2cc1f75951427e076aa31093c01d8441ded (patch) | |
| tree | 8f88e29a3f52024d791399f63db9d99c6c179d66 /src | |
| parent | 6effbcb5203cda0f743417bd5585942c6d5a7d08 (diff) | |
Minor refactoring
Diffstat (limited to 'src')
| -rw-r--r-- | src/sp_disabled_functions.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/sp_disabled_functions.c b/src/sp_disabled_functions.c index 07c8696..6e1b95a 100644 --- a/src/sp_disabled_functions.c +++ b/src/sp_disabled_functions.c | |||
| @@ -70,25 +70,26 @@ static bool is_local_var_matching( | |||
| 70 | 70 | ||
| 71 | var_value = get_value(execute_data, config_node->var, false); | 71 | var_value = get_value(execute_data, config_node->var, false); |
| 72 | if (var_value) { | 72 | if (var_value) { |
| 73 | char* var_value_str = sp_convert_to_string(var_value); | ||
| 74 | if (Z_TYPE_P(var_value) == IS_ARRAY) { | 73 | if (Z_TYPE_P(var_value) == IS_ARRAY) { |
| 75 | if (config_node->key || config_node->r_key) { | 74 | if (config_node->key || config_node->r_key) { |
| 76 | if (sp_match_array_key(var_value, config_node->key, | 75 | if (sp_match_array_key(var_value, config_node->key, |
| 77 | config_node->r_key)) { | 76 | config_node->r_key)) { |
| 78 | efree(var_value_str); | ||
| 79 | return true; | 77 | return true; |
| 80 | } | 78 | } |
| 81 | } else if (sp_match_array_value(var_value, config_node->value, | 79 | } else if (sp_match_array_value(var_value, config_node->value, |
| 82 | config_node->value_r)) { | 80 | config_node->value_r)) { |
| 83 | efree(var_value_str); | ||
| 84 | return true; | 81 | return true; |
| 85 | } | 82 | } |
| 86 | } else if (sp_match_value(var_value_str, config_node->value, | 83 | } else { |
| 87 | config_node->value_r)) { | 84 | char* var_value_str = sp_convert_to_string(var_value); |
| 85 | bool match = sp_match_value(var_value_str, config_node->value, | ||
| 86 | config_node->value_r); | ||
| 88 | efree(var_value_str); | 87 | efree(var_value_str); |
| 89 | return true; | 88 | |
| 89 | if (true == match) { | ||
| 90 | return true; | ||
| 91 | } | ||
| 90 | } | 92 | } |
| 91 | efree(var_value_str); | ||
| 92 | } | 93 | } |
| 93 | return false; | 94 | return false; |
| 94 | } | 95 | } |
