storage: don't leak memory for unittests

diff --git a/src/runmode-unittests.c b/src/runmode-unittests.c
index 61fd5e6fda70e56c84a803e8e7a260d8360a2967..222ed5f618b429bbfddb4eea94dabdbba29bec8f 100644 (file)
--- a/src/runmode-unittests.c
+++ b/src/runmode-unittests.c
@@ -261,13 +261,13 @@ void RunUnittests(int list_unittests, const char *regex_arg)
     MpmTableSetup();
     SpmTableSetup();
 
+    StorageInit();
     AppLayerSetup();
 
     /* hardcoded initialization code */
     SigTableSetup(); /* load the rule keywords */
     TmqhSetup();
 
-    StorageInit();
     CIDRInit();
 
 #ifdef DBG_MEM_ALLOC

diff --git a/src/util-storage.c b/src/util-storage.c
index 1d6ee129a64090dbcb5790f0ff4cc87aba97d01a..894abfdda75b1cf40960d789d5b26d3546632771 100644 (file)
--- a/src/util-storage.c
+++ b/src/util-storage.c
@@ -175,8 +175,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++) {