[PATCH 04/20] storage: Free hash table entries when freeing storage

[Bart Van Assche <bvanassche@acm.org>]

Free allocated hash table entries when freeing storage structures in
storage.c to prevent memory leaks during storage teardown.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
 storage.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/storage.c b/storage.c
index 6fc6e3d7085f..160d424ee1f6 100644
--- a/storage.c
+++ b/storage.c
@@ -159,12 +159,18 @@ static void vrfy_storage(struct storage_hash_list **listp)
 
 void free_storage(void)
 {
+	struct storage_hash_list *all = NULL;
 	int i;
 
 	for (i = 0; i < MAX_STORAGE_HASH; i++) {
-		vrfy_storage(storage_hash_table + i);
+		struct storage_hash *entry;
+		FOR_EACH_PTR(storage_hash_table[i], entry) {
+			add_ptr_list(&all, entry);
+		} END_FOR_EACH_PTR(entry);
 		free_ptr_list(storage_hash_table + i);
 	}
+	vrfy_storage(&all);
+	free_ptr_list(&all);
 }
 
 const char *show_storage(struct storage *s)
@@ -208,7 +214,7 @@ static struct storage * combine_storage(struct storage *src, struct storage *dst
 
 	/* Mark it unused */
 	src->type = REG_BAD;
-	src->users = NULL;
+	free_ptr_list(&src->users);
 	return dst;
 }