From 490dc4e2a43a5f8256f0b00d5efd3c2a84487905 Mon Sep 17 00:00:00 2001
From: Ben Fuhrmannek
Date: Tue, 19 Apr 2022 19:01:52 +0200
Subject: extended checks for readonly_exec, enabled by default

introduced config options:
readonly_exec.extended_checks() or xchecks()
readonly_exec.no_extended_checks() or noxchecks()
---
 src/snuffleupagus.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/snuffleupagus.c')

diff --git a/src/snuffleupagus.c b/src/snuffleupagus.c
index ebb7f9c..c723199 100644
--- a/src/snuffleupagus.c
+++ b/src/snuffleupagus.c
@@ -348,6 +348,7 @@ static void dump_config() {
   add_assoc_bool(&arr, "readonly_exec.enable", SPCFG(readonly_exec).enable);
   add_assoc_bool(&arr, "readonly_exec.sim", SPCFG(readonly_exec).simulation);
   ADD_ASSOC_ZSTR(&arr, SP_TOKEN_READONLY_EXEC "." SP_TOKEN_DUMP, SPCFG(readonly_exec).dump);
+  add_assoc_bool(&arr, "readonly_exec.extended_checks", SPCFG(readonly_exec).extended_checks);
 
   add_assoc_bool(&arr, "global_strict.enable", SPCFG(global_strict).enable);
 
@@ -499,6 +500,7 @@ static PHP_INI_MH(OnUpdateConfiguration) {
 
   // set some defaults
   SPCFG(show_old_php_warning) = true;
+  SPCFG(readonly_exec).extended_checks = true;
 
   char *str = new_value->val;
 
-- 
cgit v1.3


From 04a66f65b58d57fc419f2f22b3e480b1565cd229 Mon Sep 17 00:00:00 2001
From: Ben Fuhrmannek
Date: Mon, 18 Jul 2022 17:07:05 +0200
Subject: fixed crash when exporting function list (rare edge case problem)

---
 src/snuffleupagus.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/snuffleupagus.c')

diff --git a/src/snuffleupagus.c b/src/snuffleupagus.c
index c723199..af4d8e9 100644
--- a/src/snuffleupagus.c
+++ b/src/snuffleupagus.c
@@ -273,7 +273,7 @@ static void add_df_to_arr(zval *arr, sp_disabled_function *df) {
   if (df->functions_list && df->functions_list->data) {
     zval arr_fl;
     array_init(&arr_fl);
-    for (sp_list_node *p = df->functions_list; p; p = p->next) { add_next_index_str(&arr_fl, p->data); }
+    for (sp_list_node *p = df->functions_list; p; p = p->next) { add_next_index_string(&arr_fl, (char*)p->data); }
     add_assoc_zval(&arr_df, "function_list", &arr_fl);
   } else {
     add_assoc_null(&arr_df, "function_list");
-- 
cgit v1.3


From 714cae56b88d88c888b5edeeddb40f55d5409d07 Mon Sep 17 00:00:00 2001
From: Ben Fuhrmannek
Date: Wed, 20 Jul 2022 10:43:06 +0200
Subject: add disabled functions return type to config export

---
 src/snuffleupagus.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/snuffleupagus.c')

diff --git a/src/snuffleupagus.c b/src/snuffleupagus.c
index af4d8e9..74af0ed 100644
--- a/src/snuffleupagus.c
+++ b/src/snuffleupagus.c
@@ -291,6 +291,7 @@ static void add_df_to_arr(zval *arr, sp_disabled_function *df) {
   add_assoc_long(&arr_df, SP_TOKEN_LINE_NUMBER, df->line);
   ADD_ASSOC_ZSTR(&arr_df, SP_TOKEN_RET, df->ret);
   ADD_ASSOC_REGEXP(&arr_df, SP_TOKEN_RET_REGEXP, df->r_ret);
+  add_assoc_long(&arr_df, SP_TOKEN_RET_TYPE, df->ret_type);
   ADD_ASSOC_ZSTR(&arr_df, SP_TOKEN_VALUE, df->value);
   ADD_ASSOC_REGEXP(&arr_df, SP_TOKEN_VALUE_REGEXP, df->r_value);
   ADD_ASSOC_ZSTR(&arr_df, SP_TOKEN_KEY, df->key);
-- 
cgit v1.3