From 54c352c1b5aa08b187dd1e52e544709cad2b0fee Mon Sep 17 00:00:00 2001
From: Ben Fuhrmannek
Date: Thu, 23 Sep 2021 12:23:40 +0200
Subject: 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
---
 src/sp_session.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/sp_session.c')

diff --git a/src/sp_session.c b/src/sp_session.c
index 64233d1..b54849e 100644
--- a/src/sp_session.c
+++ b/src/sp_session.c
@@ -25,7 +25,7 @@ static int (*previous_sessionRINIT)(INIT_FUNC_ARGS) = NULL;
 static ZEND_INI_MH((*old_OnUpdateSaveHandler)) = NULL;
 
 static void check_sid_length(zend_string *sid) {
-  const sp_config_session *cfg = SNUFFLEUPAGUS_G(config).config_session;
+  const sp_config_session *cfg = &(SPCFG(session));
 
   if (sid) {
     if (cfg->sid_min_length && ZSTR_LEN(sid) < cfg->sid_min_length) {
@@ -38,7 +38,7 @@ static void check_sid_length(zend_string *sid) {
 }
 
 static int sp_hook_s_read(PS_READ_ARGS) {
-  const sp_config_session *cfg = SNUFFLEUPAGUS_G(config).config_session;
+  const sp_config_session *cfg = &(SPCFG(session));
   check_sid_length(key);
 
   int r = old_s_read(mod_data, key, val, maxlifetime);
@@ -65,7 +65,7 @@ static int sp_hook_s_read(PS_READ_ARGS) {
 }
 
 static int sp_hook_s_write(PS_WRITE_ARGS) {
-  const sp_config_session *cfg = SNUFFLEUPAGUS_G(config).config_session;
+  const sp_config_session *cfg = &(SPCFG(session));
   check_sid_length(key);
 
   if (ZSTR_LEN(val) > 0 && cfg->encrypt) {
-- 
cgit v1.3