| commit | 465028e0e25518bfff8b83057775cb6b2df2aade | |
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
| Thu, 7 Oct 2021 10:01:37 +0000 (7 12:01 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 7 Oct 2021 22:40:16 +0000 (7 15:40 -0700) | ||
| tree | b8b76f7f93aa796181190a543f01c71064015f41 | treesnapshot (tar.gz zip) |
| parent | 272f0a574d97ecd245fb0a9ab63c436e8cfe6a06 | commitdiff |
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>
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>
| builtin/merge.c | diffblobblamehistory | |
| t/t7604-merge-custom-message.sh | diffblobblamehistory |