From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 26 May 2015 20:24:44 +0000 (-0700)
Subject: Merge branch 'rs/plug-leak-in-pack-bitmaps'
X-Git-Tag: v2.5.0-rc0~75
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a26d48a46e8d7df58e7a91e7aac6795e29ddbd6d?ds=inline;hp=-c

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
---

a26d48a46e8d7df58e7a91e7aac6795e29ddbd6d
diff --combined pack-bitmap.c
index 62a98cc119,9af88b3b33..e5abb8a046
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@@ -60,7 -60,7 +60,7 @@@ static struct bitmap_index 
  	struct ewah_bitmap *blobs;
  	struct ewah_bitmap *tags;
  
 -	/* Map from SHA1 -> `stored_bitmap` for all the bitmapped comits */
 +	/* Map from SHA1 -> `stored_bitmap` for all the bitmapped commits */
  	khash_sha1 *bitmaps;
  
  	/* Number of bitmapped commits */
@@@ -209,14 -209,12 +209,12 @@@ static inline uint8_t read_u8(const uns
  	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;
@@@ -252,20 -250,6 +250,20 @@@
  	return 0;
  }
  
 +static char *pack_bitmap_filename(struct packed_git *p)
 +{
 +	char *idx_name;
 +	int len;
 +
 +	len = strlen(p->pack_name) - strlen(".pack");
 +	idx_name = xmalloc(len + strlen(".bitmap") + 1);
 +
 +	memcpy(idx_name, p->pack_name, len);
 +	memcpy(idx_name + len, ".bitmap", strlen(".bitmap") + 1);
 +
 +	return idx_name;
 +}
 +
  static int open_pack_bitmap_1(struct packed_git *packfile)
  {
  	int fd;
@@@ -336,6 -320,20 +334,6 @@@ failed
  	return -1;
  }
  
 -char *pack_bitmap_filename(struct packed_git *p)
 -{
 -	char *idx_name;
 -	int len;
 -
 -	len = strlen(p->pack_name) - strlen(".pack");
 -	idx_name = xmalloc(len + strlen(".bitmap") + 1);
 -
 -	memcpy(idx_name, p->pack_name, len);
 -	memcpy(idx_name + len, ".bitmap", strlen(".bitmap") + 1);
 -
 -	return idx_name;
 -}
 -
  static int open_pack_bitmap(void)
  {
  	struct packed_git *p;
@@@ -986,8 -984,6 +984,8 @@@ void test_bitmap_walk(struct rev_info *
  		fprintf(stderr, "OK!\n");
  	else
  		fprintf(stderr, "Mismatch!\n");
 +
 +	free(result);
  }
  
  static int rebuild_bitmap(uint32_t *reposition,