Skip to content

Commit

Permalink
Merge branch 'rs/plug-leak-in-pack-bitmaps' into maint
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Junio C Hamano committed Jun 5, 2015
2 parents 7c1ff53 + 599dc76 commit 0662990
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions pack-bitmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 0662990

Please sign in to comment.