mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/plug-leak-in-pack-bitmaps'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2015-05-26 13:24:44 -07:00
parent 22a1ae6ef2 599dc766e8
commit a26d48a46e
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pack-bitmap.c
View File

@ -209,14 +209,12 @@ static inline uint8_t read_u8(const unsigned char *buffer, size_t *pos)
return buffer[(*pos)++]; return buffer[(*pos)++];
} }
#define MAX_XOR_OFFSET 160
static int load_bitmap_entries_v1(struct bitmap_index *index) static int load_bitmap_entries_v1(struct bitmap_index *index)
{ {
static const size_t MAX_XOR_OFFSET = 160;
uint32_t i; uint32_t i;
struct stored_bitmap **recent_bitmaps; struct stored_bitmap *recent_bitmaps[MAX_XOR_OFFSET] = { NULL };
recent_bitmaps = xcalloc(MAX_XOR_OFFSET, sizeof(struct stored_bitmap));
for (i = 0; i < index->entry_count; ++i) { for (i = 0; i < index->entry_count; ++i) {
int xor_offset, flags; int xor_offset, flags;