From 1e8e75b554955cc59866a41bb32853a96e8e83ae Mon Sep 17 00:00:00 2001
From: Sylvain "caillou" Lefevre
Date: Sun, 3 Jan 2021 20:40:37 +0100
Subject: Don't fallback to local variables when unable to get function
 parameter

---
 src/sp_var_value.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/sp_var_value.c b/src/sp_var_value.c
index 8109377..986ea2d 100644
--- a/src/sp_var_value.c
+++ b/src/sp_var_value.c
@@ -51,7 +51,6 @@ static zval *get_local_var(zend_execute_data *ed, const char *var_name) {
 static zval *get_constant(const char *value) {
   zend_string *name = zend_string_init(value, strlen(value), 0);
   zval *zvalue = zend_get_constant_ex(name, NULL, ZEND_FETCH_CLASS_SILENT);
-
   zend_string_release(name);
   return zvalue;
 }
@@ -69,14 +68,10 @@ static zval *get_var_value(zend_execute_data *ed, const char *var_name,
   }
 
   if (is_param) {
-    zval *zvalue = get_param_var(ed, var_name);
-    if (!zvalue) {
-      return get_local_var(ed, var_name);
-    }
-    return zvalue;
+    return get_param_var(ed, var_name);
+  } else {
+    return get_local_var(ed, var_name);
   }
-
-  return get_local_var(ed, var_name);
 }
 
 static void *get_entry_hashtable(const HashTable *ht, const char *entry,
-- 
cgit v1.3