From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Phillip Wood via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Phillip Wood <phillip.wood@dunelm.org.uk>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH] add -p: fix memory leak
Date: Tue, 8 Sep 2020 14:09:50 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2009081409300.54@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <pull.729.git.1599491041170.gitgitgadget@gmail.com>
Hi Phillip,
On Mon, 7 Sep 2020, Phillip Wood via GitGitGadget wrote:
> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>
> asan reports that the C version of `add -p` is not freeing all the
> memory it allocates. Fix this by introducing a function to clear
> `struct add_p_state` and use it instead of freeing individual members.
>
> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
ACK! And thanks for fixing bugs I introduced,
Dscho
> ---
> add -p: fix memory leak
>
> It seems to be the season for add -p fixes. This patch fixes a memory
> leak in the C version found with asan.
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-729%2Fphillipwood%2Fwip%2Fadd-p-fix-memory-leak-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-729/phillipwood/wip/add-p-fix-memory-leak-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/729
>
> add-patch.c | 24 ++++++++++++++++--------
> 1 file changed, 16 insertions(+), 8 deletions(-)
>
> diff --git a/add-patch.c b/add-patch.c
> index 457b8c550e..2fcab983a6 100644
> --- a/add-patch.c
> +++ b/add-patch.c
> @@ -266,6 +266,20 @@ struct add_p_state {
> const char *revision;
> };
>
> +static void add_p_state_clear(struct add_p_state *s)
> +{
> + size_t i;
> +
> + strbuf_release(&s->answer);
> + strbuf_release(&s->buf);
> + strbuf_release(&s->plain);
> + strbuf_release(&s->colored);
> + for (i = 0; i < s->file_diff_nr; i++)
> + free(s->file_diff[i].hunk);
> + free(s->file_diff);
> + clear_add_i_state(&s->s);
> +}
> +
> static void err(struct add_p_state *s, const char *fmt, ...)
> {
> va_list args;
> @@ -1690,9 +1704,7 @@ int run_add_p(struct repository *r, enum add_p_mode mode,
> repo_refresh_and_write_index(r, REFRESH_QUIET, 0, 1,
> NULL, NULL, NULL) < 0) ||
> parse_diff(&s, ps) < 0) {
> - strbuf_release(&s.plain);
> - strbuf_release(&s.colored);
> - clear_add_i_state(&s.s);
> + add_p_state_clear(&s);
> return -1;
> }
>
> @@ -1707,10 +1719,6 @@ int run_add_p(struct repository *r, enum add_p_mode mode,
> else if (binary_count == s.file_diff_nr)
> fprintf(stderr, _("Only binary files changed.\n"));
>
> - strbuf_release(&s.answer);
> - strbuf_release(&s.buf);
> - strbuf_release(&s.plain);
> - strbuf_release(&s.colored);
> - clear_add_i_state(&s.s);
> + add_p_state_clear(&s);
> return 0;
> }
>
> base-commit: 3a238e539bcdfe3f9eb5010fd218640c1b499f7a
> --
> gitgitgadget
>
prev parent reply other threads:[~2020-09-08 16:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-07 15:04 [PATCH] add -p: fix memory leak Phillip Wood via GitGitGadget
2020-09-08 12:09 ` Johannes Schindelin [this message]
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=nycvar.QRO.7.76.6.2009081409300.54@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/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).