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_wrapper.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/sp_wrapper.c')

diff --git a/src/sp_wrapper.c b/src/sp_wrapper.c
index 7610114..1538e33 100644
--- a/src/sp_wrapper.c
+++ b/src/sp_wrapper.c
@@ -1,7 +1,7 @@
 #include "php_snuffleupagus.h"
 
 static bool wrapper_is_whitelisted(const zend_string *const zs) {
-  const sp_list_node *list = SNUFFLEUPAGUS_G(config).config_wrapper->whitelist;
+  const sp_list_node *list = SPCFG(wrapper).whitelist;
 
   if (!zs) {
     return false;  // LCOV_EXCL_LINE
@@ -38,8 +38,7 @@ void sp_disable_wrapper() {
 
   zend_hash_destroy(orig_complete);
   pefree(orig_complete, 1);
-  SNUFFLEUPAGUS_G(config).config_wrapper->num_wrapper =
-      zend_hash_num_elements(orig);
+  SPCFG(wrapper).num_wrapper = zend_hash_num_elements(orig);
 }
 
 PHP_FUNCTION(sp_stream_wrapper_register) {
@@ -53,9 +52,7 @@ PHP_FUNCTION(sp_stream_wrapper_register) {
   // LCOV_EXCL_BR_END
 
   if (wrapper_is_whitelisted(protocol_name)) {
-    orig_handler = zend_hash_str_find_ptr(
-        SNUFFLEUPAGUS_G(sp_internal_functions_hook), "stream_wrapper_register",
-        sizeof("stream_wrapper_register") - 1);
+    orig_handler = zend_hash_str_find_ptr(SPG(sp_internal_functions_hook), ZEND_STRL("stream_wrapper_register"));
     orig_handler(INTERNAL_FUNCTION_PARAM_PASSTHRU);
   }
 }
-- 
cgit v1.3