From: "Rubén Justo" <rjusto@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [PATCH 0/4] fix a leak with excludes_file
Date: Sun, 7 Apr 2024 19:48:48 +0200 [thread overview]
Message-ID: <1323321b-554e-4b16-a814-03710c50db99@gmail.com> (raw)
In-Reply-To: <xmqq7chajs3e.fsf@gitster.g>
On Sat, Apr 06, 2024 at 10:53:09AM -0700, Junio C Hamano wrote:
> Rubén Justo <rjusto@gmail.com> writes:
>
> > We call twice to git_config(): first to get the main git-branch(1) options,
> > and second to get the ones related to the sequencer.
Obviously I meant git-rebase(1) -- or any other command that uses the
sequencer under the hood.
> Adding a parallel API
> next to the existing git_config_pathname() and interpolate_path()
> and convert only these callers that touch excludes_file would not
> help other callers that hold the pointer git_config_pathname()
> returned.
It does not have to be like that. We may no longer need the current
and problematic git_config_pathname(). However I did not want to go
that far in this series.
> config.c | 4 +++-
> t/t7300-clean.sh | 1 +
> 2 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git c/config.c w/config.c
> index eebce8c7e0..ae3652b08f 100644
> --- c/config.c
> +++ w/config.c
> @@ -1584,8 +1584,10 @@ static int git_default_core_config(const char *var, const char *value,
> if (!strcmp(var, "core.askpass"))
> return git_config_string(&askpass_program, var, value);
>
> - if (!strcmp(var, "core.excludesfile"))
> + if (!strcmp(var, "core.excludesfile")) {
> + free((char *)excludes_file);
Aaah, you prefer this :-( ... this free is what I was referring to, in
the message you are replying to, as the simpler fix ...
It obviously plugs the leak and so my itch is gone; therefore OK by me
to the series I have seen that you have already sent with this.
Still, I find the approach in this series more interesting than the
simple free. The strbuf saves us from subsequent free+alloc's, for
exactly the same "core.excludesFile". The strbuf states clearly, IMHO,
who owns the pointer. And other niceties.
next prev parent reply other threads:[~2024-04-07 17:49 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-06 14:29 [PATCH 0/4] fix a leak with excludes_file Rubén Justo
2024-04-06 14:31 ` [PATCH 1/4] path.c: introduce strbuf_interpolate_path Rubén Justo
2024-04-06 14:32 ` [PATCH 2/4] config.c: introduce git_config_strbuf_pathname Rubén Justo
2024-04-06 14:32 ` [PATCH 3/4] environment.c: convert excludes_file to struct strbuf Rubén Justo
2024-04-06 14:32 ` [PATCH 4/4] t7300: mark as leak-free Rubén Justo
2024-04-06 17:53 ` [PATCH 0/4] fix a leak with excludes_file Junio C Hamano
2024-04-07 17:48 ` Rubén Justo [this message]
2024-04-08 17:36 ` Junio C Hamano
2024-04-08 19:33 ` Rubén Justo
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=1323321b-554e-4b16-a814-03710c50db99@gmail.com \
--to=rjusto@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).