X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fbitmap%2Fbitmap.h;h=9e6c2bbc51912d797eec56000963756598d48592;hb=9d2d2c49f053018724bcc6e37029da10b7c3d60d;hp=6cbf9a22140655a3f55277edc44a5ff23c06f9e0;hpb=f591ef48f887f6c1608cdd89d78eebacd27e8552;p=ccan

diff --git a/ccan/bitmap/bitmap.h b/ccan/bitmap/bitmap.h
index 6cbf9a22..9e6c2bbc 100644
--- a/ccan/bitmap/bitmap.h
+++ b/ccan/bitmap/bitmap.h
@@ -203,7 +203,8 @@ static inline bitmap *bitmap_alloc0(unsigned long nbits)
 	bitmap *bitmap;
 
 	bitmap = bitmap_alloc(nbits);
-	bitmap_zero(bitmap, nbits);
+	if (bitmap)
+		bitmap_zero(bitmap, nbits);
 	return bitmap;
 }
 
@@ -212,7 +213,8 @@ static inline bitmap *bitmap_alloc1(unsigned long nbits)
 	bitmap *bitmap;
 
 	bitmap = bitmap_alloc(nbits);
-	bitmap_fill(bitmap, nbits);
+	if (bitmap)
+		bitmap_fill(bitmap, nbits);
 	return bitmap;
 }
 
@@ -221,7 +223,7 @@ static inline bitmap *bitmap_realloc0(bitmap *bitmap,
 {
 	bitmap = realloc(bitmap, bitmap_sizeof(nbits));
 
-	if (nbits > obits)
+	if ((nbits > obits) && bitmap)
 		bitmap_zero_range(bitmap, obits, nbits);
 
 	return bitmap;
@@ -232,7 +234,7 @@ static inline bitmap *bitmap_realloc1(bitmap *bitmap,
 {
 	bitmap = realloc(bitmap, bitmap_sizeof(nbits));
 
-	if (nbits > obits)
+	if ((nbits > obits) && bitmap)
 		bitmap_fill_range(bitmap, obits, nbits);
 
 	return bitmap;