From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 3 Jul 2012 14:15:57 +0000 (+0200)
Subject: hashmap: make hashmap_clear() work on NULL hashmaps
X-Git-Tag: v186~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=61b1477c8107e9b7143be9acf6bf678fa9d0674d

hashmap: make hashmap_clear() work on NULL hashmaps
---

diff --git a/src/shared/hashmap.c b/src/shared/hashmap.c
index ab0095730..e2395d4d4 100644
--- a/src/shared/hashmap.c
+++ b/src/shared/hashmap.c
@@ -277,6 +277,9 @@ void hashmap_free(Hashmap*h) {
 }
 
 void hashmap_free_free(Hashmap *h) {
+        if (!h)
+                return;
+
         hashmap_clear_free(h);
         hashmap_free(h);
 }
@@ -292,7 +295,8 @@ void hashmap_clear(Hashmap *h) {
 void hashmap_clear_free(Hashmap *h) {
         void *p;
 
-        assert(h);
+        if (!h)
+                return;
 
         while ((p = hashmap_steal_first(h)))
                 free(p);