From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Jun 2015 21:33:47 +0000 (-0700)
Subject: Merge branch 'sb/test-bitmap-free-at-end' into maint
X-Git-Tag: v2.4.4~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2cd8ebdd3d28359b7886d994e84a8725394935e7?ds=inline;hp=-c

Merge branch 'sb/test-bitmap-free-at-end' into maint

An earlier leakfix to bitmap testing code was incomplete.

* sb/test-bitmap-free-at-end:
test_bitmap_walk: free bitmap with bitmap_free
---

2cd8ebdd3d28359b7886d994e84a8725394935e7
diff --combined pack-bitmap.c
index e5abb8a046,3badc2dd1d..2b3ff23797
--- 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,12 -209,14 +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;
@@@ -250,20 -252,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;
@@@ -334,6 -322,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;
@@@ -985,7 -987,7 +985,7 @@@ void test_bitmap_walk(struct rev_info *
  	else
  		fprintf(stderr, "Mismatch!\n");
  
- 	free(result);
+ 	bitmap_free(result);
  }
  
  static int rebuild_bitmap(uint32_t *reposition,