config is stack allocated now + some code improvements (see details)

* for easier memory manegement, the entire sp_config struct was merged into snuffleupagus_globals and allocated on stack where possible
* SNUFFLEUPAGUS_G() can be written as SPG(), which is faster to type and easier to read
* execution_depth is re-initialized to 0 for each request
* function calls with inline string and length parameters consistently use ZEND_STRL instead of sizeof()-1
* execution is actually hooked if recursion protection is enabled
* some line breaks were removed to make the code more readable

1 files changed, 15 insertions, 15 deletions

diff --git a/src/sp_config.c b/src/sp_config.c
index 4d96bbe..ec6c5a8 100644
--- a/src/sp_config.c
+++ b/src/sp_config.c
@@ -7,24 +7,24 @@
 
 static zend_result sp_process_config_root(sp_parsed_keyword *parsed_rule) {
   sp_config_keyword sp_func[] = {
-    {parse_unserialize,         SP_TOKEN_UNSERIALIZE_HMAC, SNUFFLEUPAGUS_G(config).config_unserialize},
-    {parse_enable,              SP_TOKEN_HARDEN_RANDOM, &(SNUFFLEUPAGUS_G(config).config_random->enable)},
-    {parse_log_media,           SP_TOKEN_LOG_MEDIA, &(SNUFFLEUPAGUS_G(config).log_media)},
+    {parse_unserialize,         SP_TOKEN_UNSERIALIZE_HMAC, &(SPCFG(unserialize))},
+    {parse_enable,              SP_TOKEN_HARDEN_RANDOM, &(SPCFG(random).enable)},
+    {parse_log_media,           SP_TOKEN_LOG_MEDIA, &(SPCFG(log_media))},
     {parse_disabled_functions,  SP_TOKEN_DISABLE_FUNC, NULL},
-    {parse_readonly_exec,       SP_TOKEN_READONLY_EXEC, SNUFFLEUPAGUS_G(config).config_readonly_exec},
-    {parse_enable,              SP_TOKEN_GLOBAL_STRICT, &(SNUFFLEUPAGUS_G(config).config_global_strict->enable)},
-    {parse_upload_validation,   SP_TOKEN_UPLOAD_VALIDATION, SNUFFLEUPAGUS_G(config).config_upload_validation},
+    {parse_readonly_exec,       SP_TOKEN_READONLY_EXEC, &(SPCFG(readonly_exec))},
+    {parse_enable,              SP_TOKEN_GLOBAL_STRICT, &(SPCFG(global_strict).enable)},
+    {parse_upload_validation,   SP_TOKEN_UPLOAD_VALIDATION, &(SPCFG(upload_validation))},
     {parse_cookie,              SP_TOKEN_COOKIE_ENCRYPTION, NULL},
     {parse_global,              SP_TOKEN_GLOBAL, NULL},
-    {parse_enable,              SP_TOKEN_AUTO_COOKIE_SECURE, &(SNUFFLEUPAGUS_G(config).config_auto_cookie_secure->enable)},
-    {parse_enable,              SP_TOKEN_DISABLE_XXE, &(SNUFFLEUPAGUS_G(config).config_disable_xxe->enable)},
-    {parse_eval_filter_conf,    SP_TOKEN_EVAL_BLACKLIST, &(SNUFFLEUPAGUS_G(config).config_eval->blacklist)},
-    {parse_eval_filter_conf,    SP_TOKEN_EVAL_WHITELIST, &(SNUFFLEUPAGUS_G(config).config_eval->whitelist)},
-    {parse_session,             SP_TOKEN_SESSION_ENCRYPTION, SNUFFLEUPAGUS_G(config).config_session},
-    {parse_enable,              SP_TOKEN_SLOPPY_COMPARISON, &(SNUFFLEUPAGUS_G(config).config_sloppy->enable)},
-    {parse_wrapper_whitelist,   SP_TOKEN_ALLOW_WRAPPERS, SNUFFLEUPAGUS_G(config).config_wrapper},
-    {parse_ini_protection,      SP_TOKEN_INI_PROTECTION, SNUFFLEUPAGUS_G(config).config_ini},
-    {parse_ini_entry,           SP_TOKEN_INI, SNUFFLEUPAGUS_G(config).config_unserialize},
+    {parse_enable,              SP_TOKEN_AUTO_COOKIE_SECURE, &(SPCFG(auto_cookie_secure).enable)},
+    {parse_enable,              SP_TOKEN_DISABLE_XXE, &(SPCFG(disable_xxe).enable)},
+    {parse_eval_filter_conf,    SP_TOKEN_EVAL_BLACKLIST, &(SPCFG(eval).blacklist)},
+    {parse_eval_filter_conf,    SP_TOKEN_EVAL_WHITELIST, &(SPCFG(eval).whitelist)},
+    {parse_session,             SP_TOKEN_SESSION_ENCRYPTION, &(SPCFG(session))},
+    {parse_enable,              SP_TOKEN_SLOPPY_COMPARISON, &(SPCFG(sloppy).enable)},
+    {parse_wrapper_whitelist,   SP_TOKEN_ALLOW_WRAPPERS, &(SPCFG(wrapper))},
+    {parse_ini_protection,      SP_TOKEN_INI_PROTECTION, &(SPCFG(ini))},
+    {parse_ini_entry,           SP_TOKEN_INI, NULL},
     {NULL, NULL, NULL}};
   return sp_process_rule(parsed_rule, sp_func);
 }