From 951c3eefacedcdbdb2cebf245f043aa3e81fb483 Mon Sep 17 00:00:00 2001 From: Martin Mikkelsen Date: Fri, 31 Jul 2015 19:01:34 +0200 Subject: bitmap: make bitmap_clear free the bitmap array Given two bitmaps and the following code: Bitmap *a = bitmap_new(), *b = bitmap_new(); bitmap_set(a, 1); bitmap_clear(a); bitmap_set(a, 0); bitmap_set(b, 0); These two bitmaps should now have the same bits set and they should be equal but bitmap_equal() will return false in this case because while bitmap_clear() resets the number of elements in the array it does not clear the array and bitmap_set() expects the array to be cleared. GREEDY_REALLOC0 looks at the allocated size and not the actual size so it does not clear any memory. Fix this by freeing the allocated memory and resetting the whole Bitmap to an initial state in bitmap_clear(). This also adds test code for this issue. --- src/basic/bitmap.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/basic/bitmap.c') diff --git a/src/basic/bitmap.c b/src/basic/bitmap.c index e7e19b3b66..7ea3357031 100644 --- a/src/basic/bitmap.c +++ b/src/basic/bitmap.c @@ -145,7 +145,10 @@ bool bitmap_isclear(Bitmap *b) { void bitmap_clear(Bitmap *b) { assert(b); + free(b->bitmaps); + b->bitmaps = NULL; b->n_bitmaps = 0; + b->bitmaps_allocated = 0; } bool bitmap_iterate(Bitmap *b, Iterator *i, unsigned *n) { -- cgit v1.2.3-54-g00ecf