@matheusbsbs / matheus-bagliano / commits / 6e658547d3

sequencer: fix a memory leak in do_reset()

Fix a memory leak introduced in 9055e401dd6 (sequencer: introduce new commands to reset the revision, 2018-04-25), which called setup_unpack_trees_porcelain() without a corresponding call to clear_unpack_trees_porcelain(). This introduces a change in behavior in that we now start calling clear_unpack_trees_porcelain() even without having called the setup_unpack_trees_porcelain(). That's OK, that clear function, like most others, will accept a zero'd out struct. This inches us closer to passing various tests in "t34*.sh" (e.g. "t3434-rebase-i18n.sh"), but because they have so many other memory leaks in revisions.c this doesn't make any test file or even a single test pass. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Oct 13, 2021 at 15:23 UTC 6e658547d35515da6ba55d285d6699b7f04cb939

1 file changed +2 -2

sequencer.c

+2 -2

@@ -3646,7 +3646,7 @@ static int do_reset(struct repository *r,

3646 struct lock_file lock = LOCK_INIT;

3647 struct tree_desc desc = { 0 };

3648 struct tree *tree;

3649 - struct unpack_trees_options unpack_tree_opts;

3649 + struct unpack_trees_options unpack_tree_opts = { 0 };

3650 int ret = 0;

3651

3652 if (repo_hold_locked_index(r, &lock, LOCK_REPORT_ON_ERROR) < 0)

@@ -3683,7 +3683,6 @@ static int do_reset(struct repository *r,

3683 }

3684 }

3685

3686 - memset(&unpack_tree_opts, 0, sizeof(unpack_tree_opts));

3686 setup_unpack_trees_porcelain(&unpack_tree_opts, "reset");

3687 unpack_tree_opts.head_idx = 1;

3688 unpack_tree_opts.src_index = r->index;

@@ -3723,6 +3722,7 @@ cleanup:

3722 if (ret < 0)

3723 rollback_lock_file(&lock);

3724 strbuf_release(&ref_name);

3725 + clear_unpack_trees_porcelain(&unpack_tree_opts);

3726 return ret;

3727 }

3728