From cd9031935ef2306f7ba2097856b20bf116f341ee 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/sp_config_keywords.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/sp_config_keywords.c')

diff --git a/src/sp_config_keywords.c b/src/sp_config_keywords.c
index f7be731..e0e5166 100644
--- a/src/sp_config_keywords.c
+++ b/src/sp_config_keywords.c
@@ -96,7 +96,7 @@ SP_PARSE_FN(parse_unserialize) {
 }
 
 SP_PARSE_FN(parse_readonly_exec) {
-  bool enable = false, disable = false;
+  bool enable = false, disable = false, xchecks = false, no_xchecks = false;
   sp_config_readonly_exec *cfg = (sp_config_readonly_exec*)retval;
 
   sp_config_keyword config_keywords[] = {
@@ -105,6 +105,10 @@ SP_PARSE_FN(parse_readonly_exec) {
       {parse_empty, SP_TOKEN_SIMULATION, &(cfg->simulation)},
       {parse_empty, SP_TOKEN_SIM, &(cfg->simulation)},
       {parse_str, SP_TOKEN_DUMP, &(cfg->dump)},
+      {parse_empty, "extended_checks", &(xchecks)},
+      {parse_empty, "xchecks", &(xchecks)},
+      {parse_empty, "no_extended_checks", &(no_xchecks)},
+      {parse_empty, "noxchecks", &(no_xchecks)},
       {0, 0, 0}};
 
   SP_PROCESS_CONFIG_KEYWORDS_ERR();
@@ -112,6 +116,7 @@ SP_PARSE_FN(parse_readonly_exec) {
   cfg->textual_representation = sp_get_textual_representation(parsed_rule);
 
   SP_SET_ENABLE_DISABLE(enable, disable, cfg->enable);
+  if (xchecks) { cfg->extended_checks = true; } else if (no_xchecks) { cfg->extended_checks = false; }
 
   return SP_PARSER_STOP;
 }
-- 
cgit v1.3


From b839c4629ec27821dd8ee2683fe7c7d9d8f6dd1a Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Mon, 18 Jul 2022 20:45:58 +0200
Subject: Remove a superfluous condition

---
 src/sp_config_keywords.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/sp_config_keywords.c')

diff --git a/src/sp_config_keywords.c b/src/sp_config_keywords.c
index e0e5166..ea4e1cd 100644
--- a/src/sp_config_keywords.c
+++ b/src/sp_config_keywords.c
@@ -394,10 +394,8 @@ SP_PARSE_FN(parse_disabled_functions) {
   return SP_PARSER_STOP;
 
 out:
-  if (df) {
-    sp_free_disabled_function(df);
-    pefree(df, 1);
-  }
+  sp_free_disabled_function(df);
+  pefree(df, 1);
   if (param) { zend_string_release(param); }
   if (var) { zend_string_release(var); }
 
-- 
cgit v1.3