diff options
| author | René Scharfe <l.s.r@web.de> | 2015-05-19 01:24:09 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-19 09:31:09 -0700 |
| commit | 599dc766e89fe4f964c197f8d109dfc2e3c890ba (patch) | |
| tree | f09a09a6350f8ac6ad89df4c9cdbbca32dd4c2ee | |
| parent | 52735a689270bb1de94eb3de198594b36caed9bb (diff) | |
| download | git-rs/plug-leak-in-pack-bitmaps.tar.gz | |
pack-bitmaps: plug memory leak, fix allocation size for recent_bitmapsrs/plug-leak-in-pack-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>
| -rw-r--r-- | pack-bitmap.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pack-bitmap.c b/pack-bitmap.c index 6a818419ca..9af88b3b33 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; |