From 3fdc6183b083a5f42267eda88048f1b3bd9a21f2 Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Fri, 26 Oct 2018 16:03:05 +0200
Subject: [PATCH] storage: don't leak memory for unittests

---
 src/runmode-unittests.c | 2 +-
 src/util-storage.c      | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/runmode-unittests.c b/src/runmode-unittests.c
index daceaf12ea..4c69f92bcc 100644
--- 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 7954f29765..c4e92055d5 100644
--- 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++) {
-- 
2.47.2