From: Patrick Steinhardt <ps@pks.im>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Brooke Kuhlmann <brooke@alchemists.io>
Subject: Re: [PATCH 6/9] ref-filter: fix leak of %(trailers) "argbuf"
Date: Tue, 10 Sep 2024 08:09:03 +0200 [thread overview]
Message-ID: <Zt_ifxQq-6wNaQ3J@pks.im> (raw)
In-Reply-To: <20240909231828.GF921834@coredump.intra.peff.net>
On Mon, Sep 09, 2024 at 07:18:28PM -0400, Jeff King wrote:
> When we parse a placeholder like "%(trailers:key=foo)", our atom parsing
> function is passed just the argument string "key=foo". We duplicate this
> into its own string, but never free it, causing a leak.
>
> We do the duplication for two reasons:
>
> 1. There's a mismatch with the pretty.c trailer-formatting code that
> we rely on. It expects to see a closing paren, like "key=foo)". So
> we duplicate the argument string with that extra character to pass
> along.
>
> This is probably something we could fix in the long run, but it's
> somewhat non-trivial if we want to avoid regressing error cases for
> things like "git log --format='%(trailer:oops'". So let's accept
> it as a necessity for now.
>
> 2. The argument parser expects to store the list of "key" entries
> ("foo" in this case) in a string-list. It also stores the length of
> the string in the string-list "util" field. The original caller in
> pretty.c uses this with a "nodup" string list to avoid making extra
> copies, which creates a subtle dependency on the lifetime of the
> original format string.
>
> We do the same here, which creates that same dependency. So we
> can't simply free it as soon as the parsing is done.
>
> There are two possible solutions here. The first is to hold on to the
> duplicated "argbuf" string in the used_atom struct, so that it lives as
> long as the string_list which references it.
>
> But I think a less-subtle solution, and what this patch does, is to
> switch to a duplicating string_list. That makes it self-contained, and
> lets us free argbuf immediately. It may involve a few extra allocations,
> but this parsing is something that happens once per program, not once
> per output ref.
Sensible. I found that in many cases, the `nodup` variants of string
lists bring more pain than real benefit.
> This clears up one case that LSan finds in t6300, but there are more.
Yeah, there are a bunch of memory leaks around atom parsing in general
exposed by t6300. Thanks for plugging some of them!
Patrick
next prev parent reply other threads:[~2024-09-10 6:09 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-09 23:07 [PATCH 0/9] ref-filter %(trailer) fixes Jeff King
2024-09-09 23:08 ` [PATCH 1/9] t6300: drop newline from wrapped test title Jeff King
2024-09-09 23:12 ` [PATCH 2/9] ref-filter: avoid extra copies of payload/signature Jeff King
2024-09-10 6:09 ` Patrick Steinhardt
2024-09-10 6:26 ` Jeff King
2024-09-09 23:14 ` [PATCH 3/9] ref-filter: strip signature when parsing tag trailers Jeff King
2024-09-10 6:08 ` Patrick Steinhardt
2024-09-10 6:28 ` Jeff King
2024-09-09 23:14 ` [PATCH 4/9] ref-filter: drop useless cast in trailers_atom_parser() Jeff King
2024-09-09 23:16 ` [PATCH 5/9] ref-filter: store ref_trailer_buf data per-atom Jeff King
2024-09-10 6:08 ` Patrick Steinhardt
2024-09-09 23:18 ` [PATCH 6/9] ref-filter: fix leak of %(trailers) "argbuf" Jeff King
2024-09-10 6:09 ` Patrick Steinhardt [this message]
2024-09-10 6:33 ` Jeff King
2024-09-09 23:19 ` [PATCH 7/9] ref-filter: fix leak with %(describe) arguments Jeff King
2024-09-09 23:19 ` [PATCH 8/9] ref-filter: fix leak when formatting %(push:remoteref) Jeff King
2024-09-10 6:09 ` Patrick Steinhardt
2024-09-09 23:21 ` [PATCH 9/9] ref-filter: add ref_format_clear() function Jeff King
2024-09-10 6:09 ` Patrick Steinhardt
2024-09-10 6:37 ` Jeff King
2024-09-10 6:57 ` [PATCH 10/9] ref-filter: fix leak with unterminated %(if) atoms Patrick Steinhardt
2024-09-10 7:12 ` Jeff King
2024-09-10 16:48 ` Junio C Hamano
2024-09-12 10:22 ` Patrick Steinhardt
2024-09-12 11:18 ` Jeff King
2024-09-12 11:32 ` Patrick Steinhardt
2024-09-12 20:24 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Zt_ifxQq-6wNaQ3J@pks.im \
--to=ps@pks.im \
--cc=brooke@alchemists.io \
--cc=git@vger.kernel.org \
--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.
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 NNTP newsgroup(s).