mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-28 04:49:43 +01:00
Code Activity

pseudo-merge: fix various memory leaks

Browse source 
Fix various memory leaks hit by the pseudo-merge machinery. These leaks
are exposed by t5333, but plugging them does not yet make the whole test
suite pass.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt 2024-09-30 11:13:51 +02:00 committed by Junio C Hamano
parent 5ce08ed4fb
commit 55e563a90c
4 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pack-bitmap-write.c
View file

@ -64,6 +64,12 @@ static void free_pseudo_merge_commit_idx(struct pseudo_merge_commit_idx *idx)
free(idx); free(idx);
} }
static void pseudo_merge_group_release_cb(void *payload, const char *name UNUSED)
{
pseudo_merge_group_release(payload);
free(payload);
}
void bitmap_writer_free(struct bitmap_writer *writer) void bitmap_writer_free(struct bitmap_writer *writer)
{ {
uint32_t i; uint32_t i;
@ -82,6 +88,8 @@ void bitmap_writer_free(struct bitmap_writer *writer)
kh_foreach_value(writer->pseudo_merge_commits, idx, kh_foreach_value(writer->pseudo_merge_commits, idx,
free_pseudo_merge_commit_idx(idx)); free_pseudo_merge_commit_idx(idx));
kh_destroy_oid_map(writer->pseudo_merge_commits); kh_destroy_oid_map(writer->pseudo_merge_commits);
string_list_clear_func(&writer->pseudo_merge_groups,
pseudo_merge_group_release_cb);
for (i = 0; i < writer->selected_nr; i++) { for (i = 0; i < writer->selected_nr; i++) {
struct bitmapped_commit *bc = &writer->selected[i]; struct bitmapped_commit *bc = &writer->selected[i];

4
pack-bitmap.c
View file

@ -1390,8 +1390,8 @@ static struct bitmap *find_objects(struct bitmap_index *bitmap_git,
} }
base = bitmap_new(); base = bitmap_new();
if (!cascade_pseudo_merges_1(bitmap_git, base, roots_bitmap)) cascade_pseudo_merges_1(bitmap_git, base, roots_bitmap);
bitmap_free(roots_bitmap); bitmap_free(roots_bitmap);
} }
/* /*

19
pseudo-merge.c
View file

@ -97,6 +97,25 @@ static void pseudo_merge_group_init(struct pseudo_merge_group *group)
group->stable_size = DEFAULT_PSEUDO_MERGE_STABLE_SIZE; group->stable_size = DEFAULT_PSEUDO_MERGE_STABLE_SIZE;
} }
void pseudo_merge_group_release(struct pseudo_merge_group *group)
{
struct hashmap_iter iter;
struct strmap_entry *e;
regfree(group->pattern);
free(group->pattern);
strmap_for_each_entry(&group->matches, &iter, e) {
struct pseudo_merge_matches *matches = e->value;
free(matches->stable);
free(matches->unstable);
free(matches);
}
strmap_clear(&group->matches, 0);
free(group->merges);
}
static int pseudo_merge_config(const char *var, const char *value, static int pseudo_merge_config(const char *var, const char *value,
const struct config_context *ctx, const struct config_context *ctx,
void *cb_data) void *cb_data)

2
pseudo-merge.h
View file

@ -51,6 +51,8 @@ struct pseudo_merge_group {
timestamp_t stable_threshold; timestamp_t stable_threshold;
}; };
void pseudo_merge_group_release(struct pseudo_merge_group *group);
struct pseudo_merge_matches { struct pseudo_merge_matches {
struct commit **stable; struct commit **stable;
struct commit **unstable; struct commit **unstable;