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

pack-bitmap.c: more aggressively free in free_bitmap_index()

Browse Source 
The function free_bitmap_index() is somewhat lax in what it frees. There
are two notable examples:

  - While it does call kh_destroy_oid_map on the "bitmaps" map, which
    maps commit OIDs to their corresponding bitmaps, the bitmaps
    themselves are not freed. Note here that we recycle already-freed
    ewah_bitmaps into a pool, but these are handled correctly by
    ewah_pool_free().

  - We never bother to free the extended index's "positions" map, which
    we always allocate in load_bitmap().

Fix both of these.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Taylor Blau
2021-10-26 17:01:26 -04:00
committed by Junio C Hamano
parent 022815114a
commit 655b8561d6
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pack-bitmap.c
View File

@ -1859,9 +1859,17 @@ void free_bitmap_index(struct bitmap_index *b)
ewah_pool_free(b->trees); ewah_pool_free(b->trees);
ewah_pool_free(b->blobs); ewah_pool_free(b->blobs);
ewah_pool_free(b->tags); ewah_pool_free(b->tags);
if (b->bitmaps) {
struct stored_bitmap *sb;
kh_foreach_value(b->bitmaps, sb, {
ewah_pool_free(sb->root);
free(sb);
});
}
kh_destroy_oid_map(b->bitmaps); kh_destroy_oid_map(b->bitmaps);
free(b->ext_index.objects); free(b->ext_index.objects);
free(b->ext_index.hashes); free(b->ext_index.hashes);
kh_destroy_oid_pos(b->ext_index.positions);
bitmap_free(b->result); bitmap_free(b->result);
bitmap_free(b->haves); bitmap_free(b->haves);
if (bitmap_is_midx(b)) { if (bitmap_is_midx(b)) {