storage: don't leak memory for unittests

diff --git a/src/runmode-unittests.c b/src/runmode-unittests.c
index daceaf12ea4b4274264177104802a23572b0e38d..4c69f92bcc7714f489a8232cec80ed843b931252 100644 (file)
--- a/src/runmode-unittests.c
+++ b/src/runmode-unittests.c
@@ -251,13 +251,13 @@ void RunUnittests(int list_unittests, const char *regex_arg)
 #endif
     SpmTableSetup();
 
+    StorageInit();
     AppLayerSetup();
 
     /* hardcoded initialization code */
     SigTableSetup(); /* load the rule keywords */
     TmqhSetup();
 
-    StorageInit();
     CIDRInit();
     SigParsePrepare();
 

diff --git a/src/util-storage.c b/src/util-storage.c
index 7954f2976575a16d91ab75cf5ada8a61ecec69ea..c4e92055d56818fc77f1aede30059e70b3884d27 100644 (file)
--- a/src/util-storage.c
+++ b/src/util-storage.c
@@ -173,8 +173,11 @@ int StorageFinalize(void)
             storage_map[entry->map.type][entry->id].Free = entry->map.Free;
         }
 
-        entry = entry->next;
+        StorageList *next = entry->next;
+        SCFree(entry);
+        entry = next;
     };
+    storage_list = NULL;
 
 #ifdef DEBUG
     for (i = 0; i < STORAGE_MAX; i++) {