Merge pull request #54 from arpd/43-free-at-shutdown

43 free at shutdown

7 files changed, 35 insertions, 11 deletions

diff --git a/src/snuffleupagus.c b/src/snuffleupagus.c
index 01bc4f6..7db6c93 100644
--- a/src/snuffleupagus.c
+++ b/src/snuffleupagus.c
@@ -3,6 +3,7 @@
 #endif
 
 #include "php_snuffleupagus.h"
+#include "sp_config.h"
 
 #ifndef ZEND_EXT_API
 #define ZEND_EXT_API ZEND_DLEXPORT
@@ -82,9 +83,9 @@ PHP_GINIT_FUNCTION(snuffleupagus) {
   SP_INIT(snuffleupagus_globals->config.config_cookie_encryption);
   SP_INIT(snuffleupagus_globals->config.config_disabled_constructs);
 
-  snuffleupagus_globals->config.config_disabled_constructs->construct_include = sp_new_list();
-  snuffleupagus_globals->config.config_disabled_functions->disabled_functions = sp_new_list();
-  snuffleupagus_globals->config.config_disabled_functions_ret->disabled_functions = sp_new_list();
+  snuffleupagus_globals->config.config_disabled_constructs->construct_include = sp_list_new();
+  snuffleupagus_globals->config.config_disabled_functions->disabled_functions = sp_list_new();
+  snuffleupagus_globals->config.config_disabled_functions_ret->disabled_functions = sp_list_new();
 
   SP_INIT_HT(snuffleupagus_globals->config.config_cookie_encryption->names);
 
@@ -118,10 +119,21 @@ PHP_MSHUTDOWN_FUNCTION(snuffleupagus) {
   pefree(SNUFFLEUPAGUS_G(config.config_upload_validation), 1);
   pefree(SNUFFLEUPAGUS_G(config.config_cookie_encryption), 1);
 
-  sp_list_free(SNUFFLEUPAGUS_G(config.config_disabled_functions->disabled_functions));
+  sp_node_t* disabled_functions = SNUFFLEUPAGUS_G(config.config_disabled_functions->disabled_functions);
+  sp_node_t* disabled_functions_ret = SNUFFLEUPAGUS_G(config.config_disabled_functions_ret->disabled_functions);
+  sp_node_t* disabled_constructs = SNUFFLEUPAGUS_G(config.config_disabled_constructs->construct_include);
+
+  // Free the list of disabled functions for each `sp_disabled_function` instance
+  sp_disabled_function_list_free(disabled_functions);
+  sp_disabled_function_list_free(disabled_functions_ret);
+  sp_disabled_function_list_free(disabled_constructs);
+
+  sp_list_free(disabled_functions);
   pefree(SNUFFLEUPAGUS_G(config.config_disabled_functions), 1);
-  sp_list_free(SNUFFLEUPAGUS_G(config.config_disabled_functions_ret->disabled_functions));
+  sp_list_free(disabled_functions_ret);
   pefree(SNUFFLEUPAGUS_G(config.config_disabled_functions_ret), 1);
+  sp_list_free(disabled_constructs);
+  pefree(SNUFFLEUPAGUS_G(config.config_disabled_constructs), 1);
 
   UNREGISTER_INI_ENTRIES();
 
diff --git a/src/sp_config.c b/src/sp_config.c
index c41b8f7..13002cc 100644
--- a/src/sp_config.c
+++ b/src/sp_config.c
@@ -182,3 +182,13 @@ int sp_parse_config(const char *conf_file) {
   fclose(fd);
   return SUCCESS;
 }
+
+void sp_disabled_function_list_free(sp_node_t* list) {
+  sp_node_t* cursor = list;
+  while(cursor) {
+      sp_disabled_function* df = cursor->data;
+      if (df && df->functions_list)
+          sp_list_free(df->functions_list);
+      cursor = cursor->next;
+  }
+}
diff --git a/src/sp_config.h b/src/sp_config.h
index eda7517..ac33eb5 100644
--- a/src/sp_config.h
+++ b/src/sp_config.h
@@ -206,5 +206,7 @@ int parse_empty(char *restrict, char *restrict, void *);
 int parse_cidr(char *restrict, char *restrict, void *);
 int parse_php_type(char *restrict, char *restrict, void *);
 
+// cleanup
+void sp_disabled_function_list_free(sp_node_t*);
 
 #endif /* SP_CONFIG_H */
diff --git a/src/sp_config_keywords.c b/src/sp_config_keywords.c
index 3101ee1..569542c 100644
--- a/src/sp_config_keywords.c
+++ b/src/sp_config_keywords.c
@@ -259,7 +259,7 @@ int parse_disabled_functions(char *line) {
   }
 
   if (df->param && strchr(df->param, '[')) {  // assume that this is an array
-    df->param_array_keys = sp_new_list();
+    df->param_array_keys = sp_list_new();
     if (0 != array_to_list(&df->param, &df->param_array_keys)) {
       pefree(df->param_array_keys, 1);
       return -1;
@@ -268,7 +268,7 @@ int parse_disabled_functions(char *line) {
   }
 
   if (df->var && strchr(df->var, '[')) {  // assume that this is an array
-    df->var_array_keys = sp_new_list();
+    df->var_array_keys = sp_list_new();
     if (0 != array_to_list(&df->var, &df->var_array_keys)) {
       pefree(df->var_array_keys, 1);
       return -1;
diff --git a/src/sp_config_utils.c b/src/sp_config_utils.c
index 12df098..71dd373 100644
--- a/src/sp_config_utils.c
+++ b/src/sp_config_utils.c
@@ -179,7 +179,7 @@ zend_always_inline sp_node_t *parse_functions_list(char *value) {
     return NULL;
   }
 
-  sp_node_t *list = sp_new_list();
+  sp_node_t *list = sp_list_new();
   char* tmp = strdup(value);
   char* function_name;
   char *next_token = tmp;
diff --git a/src/sp_list.c b/src/sp_list.c
index 112d822..c671f51 100644
--- a/src/sp_list.c
+++ b/src/sp_list.c
@@ -11,7 +11,7 @@ void sp_list_free(sp_node_t *node) {
   }
 }
 
-sp_node_t *sp_new_list() {
+sp_node_t *sp_list_new() {
   sp_node_t *new = pecalloc(sizeof(*new), 1, 1);
   new->next = new->data = new->head = NULL;
   return new;
@@ -52,4 +52,4 @@ void sp_list_prepend(sp_node_t *list, void *data) {
     new->data = list->data;
     list->data = data;
   }
-}
\ No newline at end of file
+}
diff --git a/src/sp_list.h b/src/sp_list.h
index 476c64c..dda139f 100644
--- a/src/sp_list.h
+++ b/src/sp_list.h
@@ -8,7 +8,7 @@ typedef struct sp_node_s {
 
 } sp_node_t;
 
-sp_node_t *sp_new_list();
+sp_node_t *sp_list_new();
 void sp_list_insert(sp_node_t *, void *);
 void sp_list_free(sp_node_t *);
 void sp_list_prepend(sp_node_t *, void *);