Git development
 help / color / mirror / Atom feed
From: Patrick Steinhardt <ps@pks.im>
To: Lidong Yan via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Lidong Yan <502024330056@smail.nju.edu.cn>
Subject: Re: [PATCH] commit-graph: fix start_delayed_progress() leak
Date: Wed, 4 Jun 2025 09:42:33 +0200	[thread overview]
Message-ID: <aD_46Qxh9oVj-P3U@pks.im> (raw)
In-Reply-To: <pull.1986.git.git.1749006675784.gitgitgadget@gmail.com>

On Wed, Jun 04, 2025 at 03:11:15AM +0000, Lidong Yan via GitGitGadget wrote:
> From: Lidong Yan <502024330056@smail.nju.edu.cn>
> 
> In commit-graph.c:graph_write(), if read_one_commit() failed,
> progress allocated in start_delayed_progress() will leak. Add
> stop_progress() before goto cleanup.
> 
> Signed-off-by: Lidong Yan <502024330056@smail.nju.edu.cn>

Nit: it might make sense to send multiple patches that are related, like
your memory leak fixes, in the same patch series. That makes it a bit
easier for reviewers to group together related reviews.

> diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
> index a783a86e797..ee48980248f 100644
> --- a/builtin/commit-graph.c
> +++ b/builtin/commit-graph.c
> @@ -311,6 +311,7 @@ static int graph_write(int argc, const char **argv, const char *prefix,
>  		while (strbuf_getline(&buf, stdin) != EOF) {
>  			if (read_one_commit(&commits, progress, buf.buf)) {
>  				result = 1;
> +				stop_progress(&progress);

This function calls `stop_progress_msg()`, which knows to exit in case
`*progress` is a NULL pointer. We thus don't have to guard this line
with `if (progress)`. So the patch looks good to me, thanks!

Patrick

  reply	other threads:[~2025-06-04  7:42 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-06-04  3:11 [PATCH] commit-graph: fix start_delayed_progress() leak Lidong Yan via GitGitGadget
2025-06-04  7:42 ` Patrick Steinhardt [this message]
2025-06-04  7:47   ` lidongyan

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=aD_46Qxh9oVj-P3U@pks.im \
    --to=ps@pks.im \
    --cc=502024330056@smail.nju.edu.cn \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox