]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 272f0a5) | patch
merge: add missing strbuf_release()
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Thu, 7 Oct 2021 10:01:37 +0000 (12:01 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 7 Oct 2021 22:40:16 +0000 (15:40 -0700)
commit465028e0e25518bfff8b83057775cb6b2df2aade
treeb8b76f7f93aa796181190a543f01c71064015f41tree
parent272f0a574d97ecd245fb0a9ab63c436e8cfe6a06commit | diff
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>
builtin/merge.c diff | blob | blame | history
t/t7604-merge-custom-message.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.