summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-05-26 13:24:44 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-05-26 13:24:44 -0700
commita26d48a46e8d7df58e7a91e7aac6795e29ddbd6d (patch)
tree9150be503c650caeb5f030255bd3e25137659162
parentMerge branch 'pt/pull-ff-vs-merge-ff' (diff)
parentpack-bitmaps: plug memory leak, fix allocation size for recent_bitmaps (diff)
downloadtgif-a26d48a46e8d7df58e7a91e7aac6795e29ddbd6d.tar.xz
Merge branch 'rs/plug-leak-in-pack-bitmaps'
The code to read pack-bitmap wanted to allocate a few hundred pointers to a structure, but by mistake allocated and leaked memory enough to hold that many actual structures. Correct the allocation size and also have it on stack, as it is small enough. * rs/plug-leak-in-pack-bitmaps: pack-bitmaps: plug memory leak, fix allocation size for recent_bitmaps
-rw-r--r--pack-bitmap.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/pack-bitmap.c b/pack-bitmap.c
index 62a98cc119..e5abb8a046 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -209,14 +209,12 @@ static inline uint8_t read_u8(const unsigned char *buffer, size_t *pos)
return buffer[(*pos)++];
}
+#define MAX_XOR_OFFSET 160
+
static int load_bitmap_entries_v1(struct bitmap_index *index)
{
- static const size_t MAX_XOR_OFFSET = 160;
-
uint32_t i;
- struct stored_bitmap **recent_bitmaps;
-
- recent_bitmaps = xcalloc(MAX_XOR_OFFSET, sizeof(struct stored_bitmap));
+ struct stored_bitmap *recent_bitmaps[MAX_XOR_OFFSET] = { NULL };
for (i = 0; i < index->entry_count; ++i) {
int xor_offset, flags;