diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-10-07 12:01:37 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-08 00:40:16 +0200 |
| commit | 465028e0e25518bfff8b83057775cb6b2df2aade (patch) | |
| tree | b8b76f7f93aa796181190a543f01c71064015f41 | |
| parent | ls-files: add missing string_list_clear() (diff) | |
| download | git-465028e0e25518bfff8b83057775cb6b2df2aade.tar.xz git-465028e0e25518bfff8b83057775cb6b2df2aade.zip | |
merge: add missing strbuf_release()
We strbuf_reset() this "struct strbuf" in a loop earlier, but never
freed it. Plugs a memory leak that's been here ever since this code
got introduced in 1c7b76be7d6 (Build in merge, 2008-07-07).
This takes us from 68 failed tests in "t7600-merge.sh" to 59 under
SANITIZE=leak, and makes "t7604-merge-custom-message.sh" pass!
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/merge.c | 2 | ||||
| -rwxr-xr-x | t/t7604-merge-custom-message.sh | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 3fbdacc7db..e52f308a1a 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1576,6 +1576,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) finish(head_commit, remoteheads, &commit->object.oid, msg.buf); remove_merge_branch_state(the_repository); + strbuf_release(&msg); goto done; } else if (!remoteheads->next && common->next) ; @@ -1746,6 +1747,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) ret = suggest_conflicts(); done: + strbuf_release(&buf); free(branch_to_free); return ret; } diff --git a/t/t7604-merge-custom-message.sh b/t/t7604-merge-custom-message.sh index cd4f9607dc..eca7555101 100755 --- a/t/t7604-merge-custom-message.sh +++ b/t/t7604-merge-custom-message.sh @@ -4,6 +4,7 @@ test_description='git merge Testing merge when using a custom message for the merge commit.' +TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh create_merge_msgs() { |