From f6f1c2cc1f75951427e076aa31093c01d8441ded Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Fri, 12 Jan 2018 17:41:45 +0100
Subject: Minor refactoring

---
 src/sp_disabled_functions.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'src')

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(
 
   var_value = get_value(execute_data, config_node->var, false);
   if (var_value) {
-    char* var_value_str = sp_convert_to_string(var_value);
     if (Z_TYPE_P(var_value) == IS_ARRAY) {
       if (config_node->key || config_node->r_key) {
         if (sp_match_array_key(var_value, config_node->key,
                                config_node->r_key)) {
-          efree(var_value_str);
           return true;
         }
       } else if (sp_match_array_value(var_value, config_node->value,
                                       config_node->value_r)) {
-        efree(var_value_str);
         return true;
       }
-    } else if (sp_match_value(var_value_str, config_node->value,
-                              config_node->value_r)) {
+    } else {
+      char* var_value_str = sp_convert_to_string(var_value);
+      bool match = sp_match_value(var_value_str, config_node->value,
+                                 config_node->value_r);
       efree(var_value_str);
-      return true;
+
+      if (true == match) {
+        return true;
+      }
     }
-    efree(var_value_str);
   }
   return false;
 }
-- 
cgit v1.3