From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com> To: git@vger.kernel.org Cc: "Junio C Hamano" <gitster@pobox.com>, "Ævar Arnfjörð Bjarmason" <avarab@gmail.com> Subject: [PATCH 2/2] commit: use strbuf_release() instead of UNLEAK() Date: Wed, 16 Feb 2022 09:21:06 +0100 [thread overview] Message-ID: <patch-2.2-e3e78c9e40b-20220216T081844Z-avarab@gmail.com> (raw) In-Reply-To: <cover-0.2-00000000000-20220216T081844Z-avarab@gmail.com> Convert the UNLEAK() added in 0e5bba53af7 (add UNLEAK annotation for reducing leak false positives, 2017-09-08) to release the memory using strbuf_release() instead. The tests being marked as passing with "TEST_PASSES_SANITIZE_LEAK=true" already passed before due to the UNLEAK(), but now they really don't leak memory, so let's mark them as such. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- builtin/commit.c | 4 ++-- t/t2203-add-intent.sh | 1 + t/t7011-skip-worktree-reading.sh | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/builtin/commit.c b/builtin/commit.c index 696b3527adf..c38ae2b7656 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1866,7 +1866,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix) cleanup: strbuf_release(&author_ident); - UNLEAK(err); - UNLEAK(sb); + strbuf_release(&err); + strbuf_release(&sb); return ret; } diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh index db7ca559986..ebf58db2d18 100755 --- a/t/t2203-add-intent.sh +++ b/t/t2203-add-intent.sh @@ -2,6 +2,7 @@ test_description='Intent to add' +TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh test_expect_success 'intent to add' ' diff --git a/t/t7011-skip-worktree-reading.sh b/t/t7011-skip-worktree-reading.sh index 1761a2b1b99..4adac5acd57 100755 --- a/t/t7011-skip-worktree-reading.sh +++ b/t/t7011-skip-worktree-reading.sh @@ -5,6 +5,7 @@ test_description='skip-worktree bit test' +TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh cat >expect.full <<EOF -- 2.35.1.1028.g2d2d4be19de
next prev parent reply other threads:[~2022-02-16 8:21 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-02-16 8:21 [PATCH 0/2] commit: trivial leak fix, add 2 tests to linux-leaks CI Ævar Arnfjörð Bjarmason 2022-02-16 8:21 ` [PATCH 1/2] commit: fix "author_ident" leak Ævar Arnfjörð Bjarmason 2022-02-16 17:59 ` Junio C Hamano 2022-02-16 8:21 ` Ævar Arnfjörð Bjarmason [this message] 2022-02-16 18:03 ` [PATCH 2/2] commit: use strbuf_release() instead of UNLEAK() Junio C Hamano 2022-02-16 18:30 ` Junio C Hamano 2022-02-18 12:35 ` Whether to keep using UNLEAK() in built-ins (was: [PATCH 2/2] commit: use strbuf_release() instead of UNLEAK()) Ævar Arnfjörð Bjarmason 2022-02-18 18:19 ` Whether to keep using UNLEAK() in built-ins Junio C Hamano 2022-02-18 19:31 ` Ævar Arnfjörð Bjarmason 2022-05-12 22:51 ` [PATCH] commit: fix "author_ident" leak Junio C Hamano 2022-05-17 13:48 ` Ævar Arnfjörð Bjarmason 2022-05-18 16:30 ` Junio C Hamano
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=patch-2.2-e3e78c9e40b-20220216T081844Z-avarab@gmail.com \ --to=avarab@gmail.com \ --cc=git@vger.kernel.org \ --cc=gitster@pobox.com \ --subject='Re: [PATCH 2/2] commit: use strbuf_release() instead of UNLEAK()' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Code repositories for project(s) associated with this inbox: https://80x24.org/mirrors/git.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).