pack-bitmaps: plug memory leak, fix allocation size for recent_bitmaps
Use an automatic variable for recent_bitmaps, an array of pointers. This way we don't allocate too much and don't have to free the memory at the end. The old code over-allocated because it reserved enough memory to store all of the structs it is only pointing to and never freed it. 160 64-bit pointers take up 1280 bytes, which is not too much to be placed on the stack. MAX_XOR_OFFSET is turned into a preprocessor constant to make it constant enough for use in an non-variable array declaration. Noticed-by: Stefan Beller <stefanbeller@gmail.com> Suggested-by: Jeff King <peff@peff.net> Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe committed
May 19, 2015 at 01:24 UTC
599dc766e89fe4f964c197f8d109dfc2e3c890ba
1 file changed
+3
-5
pack-bitmap.c
+3
-5
@@ -209,14 +209,12 @@ static inline uint8_t read_u8(const unsigned char *buffer, size_t *pos)
209
return buffer[(*pos)++];
210
}
211
212
+#define MAX_XOR_OFFSET 160
213
+
214
static int load_bitmap_entries_v1(struct bitmap_index *index)
215
{
214
- static const size_t MAX_XOR_OFFSET = 160;
215
-
216
uint32_t i;
217
- struct stored_bitmap **recent_bitmaps;
218
-
219
- recent_bitmaps = xcalloc(MAX_XOR_OFFSET, sizeof(struct stored_bitmap));
217
+ struct stored_bitmap *recent_bitmaps[MAX_XOR_OFFSET] = { NULL };
218
219
for (i = 0; i < index->entry_count; ++i) {
220
int xor_offset, flags;