From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 21 Dec 2015 18:53:15 +0000 (+0100)
Subject: util-lib: make sure more bitmap calls can deal with NULL objects fine
X-Git-Tag: v229~189^2~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0b8086379f0a062582c20471d6cd2646a6d22e93;p=thirdparty%2Fsystemd.git

util-lib: make sure more bitmap calls can deal with NULL objects fine
---

diff --git a/src/basic/bitmap.c b/src/basic/bitmap.c
index 95f59e400a4..c8b2427b1cf 100644
--- a/src/basic/bitmap.c
+++ b/src/basic/bitmap.c
@@ -140,7 +140,8 @@ bool bitmap_isset(Bitmap *b, unsigned n) {
 bool bitmap_isclear(Bitmap *b) {
         unsigned i;
 
-        assert(b);
+        if (!b)
+                return true;
 
         for (i = 0; i < b->n_bitmaps; i++)
                 if (b->bitmaps[i] != 0)
@@ -150,7 +151,9 @@ bool bitmap_isclear(Bitmap *b) {
 }
 
 void bitmap_clear(Bitmap *b) {
-        assert(b);
+
+        if (!b)
+                return;
 
         b->bitmaps = mfree(b->bitmaps);
         b->n_bitmaps = 0;