[PATCH v2 14/15] revert: fix parse_options_concat() leak
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Nov 8, 2022, 18:17 UTC
- Message-ID
- <patch-v2-14.15-614c8fc1aef-20221108T172650Z-avarab@gmail.com>
- In-Reply-To
- <cover-v2-00.15-00000000000-20221108T172650Z-avarab@gmail.com>
Free memory from parse_options_concat(), which comes from code originally added (then extended) in [1].
At this point we could get several more tests leak-free by free()-ing the xstrdup() just above the line being changed, but that one's trickier than it seems. The sequencer_remove_state() function supposedly owns it, but sometimes we don't call it. I have a fix for it, but it's non-trivial, so let's fix the easy one first.
1. c62f6ec341b (revert: add --ff option to allow fast forward when cherry-picking, 2010-03-06)
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- builtin/revert.c | 1 + t/t3429-rebase-edit-todo.sh | 1 + 2 files changed, 2 insertions(+)
diff --git a/builtin/revert.c b/builtin/revert.c index 0f81c8a795a..8bc87e4c770 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -221,6 +221,7 @@ static int run_sequencer(int argc, const char **argv, struct replay_opts *opts) opts->strategy = xstrdup_or_null(opts->strategy); if (!opts->strategy && getenv("GIT_TEST_MERGE_ALGORITHM")) opts->strategy = xstrdup(getenv("GIT_TEST_MERGE_ALGORITHM")); + free(options); if (cmd == 'q') { int ret = sequencer_remove_state(opts); diff --git a/t/t3429-rebase-edit-todo.sh b/t/t3429-rebase-edit-todo.sh index abd66f36021..8e0d03969a2 100755 --- a/t/t3429-rebase-edit-todo.sh +++ b/t/t3429-rebase-edit-todo.sh @@ -2,6 +2,7 @@ test_description='rebase should reread the todo file if an exec modifies it' +TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh . "$TEST_DIRECTORY"/lib-rebase.sh
-- 2.38.0.1467.g709fbdff1a9