From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Elijah Newren" <newren@gmail.com>,
"Martin Ågren" <martin.agren@gmail.com>,
"Andrzej Hunt" <ajrhunt@google.com>, "Jeff King" <peff@peff.net>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v3 0/3] unpack-trees: memory-leak fixes
Date: Wed, 13 Oct 2021 15:23:52 +0200 [thread overview]
Message-ID: <cover-v3-0.3-00000000000-20211013T132223Z-avarab@gmail.com> (raw)
In-Reply-To: <cover-v2-0.3-00000000000-20211007T094019Z-avarab@gmail.com>
This commit-message-only-change to v2 should address the comments
Elijah had on v2 (see link in the range-diff). I.e. there's probably
bug in adjacent code in leaving a stale lockfile, but I'm punting on
that and just narrowly fixing a memory leak here.
Ævar Arnfjörð Bjarmason (3):
unpack-trees: don't leak memory in verify_clean_subdirectory()
sequencer: add a "goto cleanup" to do_reset()
sequencer: fix a memory leak in do_reset()
sequencer.c | 36 +++++++++++++++---------------------
t/t1001-read-tree-m-2way.sh | 2 ++
unpack-trees.c | 3 ++-
3 files changed, 19 insertions(+), 22 deletions(-)
Range-diff against v2:
1: e5ef1be2aa9 = 1: 0ab1e74f50d unpack-trees: don't leak memory in verify_clean_subdirectory()
2: 1d5f5e9fff0 ! 2: 393937e8a98 sequencer: add a "goto cleanup" to do_reset()
@@ Commit message
unconditionally free desc.buffer, it won't be initialized on the first
couple of "goto"'s.
- There are three earlier "return"'s in this function that I'm not
- bothering to covert, those don't need to rollback anything, or free
- any resources, so let's leave, even though they could safely "goto
- cleanup" as well.
+ There are three earlier "return"'s in this function which should
+ probably be made to use this new "cleanup" too, per [1] it looks like
+ they're leaving behind stale locks. But let's not try to fix every
+ potential bug here now, I'm just trying to narrowly plug a memory
+ leak.
+
+ 1. https://lore.kernel.org/git/CABPp-BH=3DP-dXRCphY53-3eZd1TU8h5GY_M12nnbEGm-UYB9Q@mail.gmail.com/
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
3: 66ae63db8fd ! 3: 00b6b469a8c sequencer: fix a memory leak in do_reset()
@@ Commit message
setup_unpack_trees_porcelain() without a corresponding call to
clear_unpack_trees_porcelain().
+ This introduces a change in behavior in that we now start calling
+ clear_unpack_trees_porcelain() even without having called the
+ setup_unpack_trees_porcelain(). That's OK, that clear function, like
+ most others, will accept a zero'd out struct.
+
This inches us closer to passing various tests in
"t34*.sh" (e.g. "t3434-rebase-i18n.sh"), but because they have so many
other memory leaks in revisions.c this doesn't make any test file or
--
2.33.0.1569.gd2dc77f7abf
next prev parent reply other threads:[~2021-10-13 13:24 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-06 9:40 [PATCH 0/2] dir & unpak-trees: memory-leak fixes Ævar Arnfjörð Bjarmason
2021-10-06 9:40 ` [PATCH 1/2] unpack-trees: don't leak memory in verify_clean_subdirectory() Ævar Arnfjörð Bjarmason
2021-10-06 15:58 ` Elijah Newren
2021-10-06 9:40 ` [PATCH 2/2] built-ins & lib: plug memory leaks with unpack_trees_options_release() Ævar Arnfjörð Bjarmason
2021-10-06 16:12 ` Elijah Newren
2021-10-06 16:33 ` [PATCH 0/2] dir & unpak-trees: memory-leak fixes Elijah Newren
2021-10-07 9:46 ` [PATCH v2 0/3] unpack-trees: " Ævar Arnfjörð Bjarmason
2021-10-07 9:46 ` [PATCH v2 1/3] unpack-trees: don't leak memory in verify_clean_subdirectory() Ævar Arnfjörð Bjarmason
2021-10-07 22:27 ` Junio C Hamano
2021-10-07 9:46 ` [PATCH v2 2/3] sequencer: add a "goto cleanup" to do_reset() Ævar Arnfjörð Bjarmason
2021-10-07 16:06 ` Elijah Newren
2021-10-07 9:46 ` [PATCH v2 3/3] sequencer: fix a memory leak in do_reset() Ævar Arnfjörð Bjarmason
2021-10-07 16:10 ` [PATCH v2 0/3] unpack-trees: memory-leak fixes Elijah Newren
2021-10-13 13:23 ` Ævar Arnfjörð Bjarmason [this message]
2021-10-13 13:23 ` [PATCH v3 1/3] unpack-trees: don't leak memory in verify_clean_subdirectory() Ævar Arnfjörð Bjarmason
2021-10-13 13:23 ` [PATCH v3 2/3] sequencer: add a "goto cleanup" to do_reset() Ævar Arnfjörð Bjarmason
2021-10-13 13:23 ` [PATCH v3 3/3] sequencer: fix a memory leak in do_reset() Ævar Arnfjörð Bjarmason
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=cover-v3-0.3-00000000000-20211013T132223Z-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=ajrhunt@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.agren@gmail.com \
--cc=newren@gmail.com \
--cc=peff@peff.net \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public 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).