From: Jeff King <peff@peff.net>
To: "Martin Ågren" <martin.agren@gmail.com>
Cc: git@vger.kernel.org, Stephan Beyer <s-beyer@gmx.net>
Subject: Re: [PATCH] diff-lib: clear `pending` object-array in `index_differs_from()`
Date: Wed, 20 Sep 2017 16:02:29 -0400 [thread overview]
Message-ID: <20170920200229.bc4yniz6otng2zyz@sigill.intra.peff.net> (raw)
In-Reply-To: <1505936846-2195-2-git-send-email-martin.agren@gmail.com>
On Wed, Sep 20, 2017 at 09:47:24PM +0200, Martin Ågren wrote:
> Instead of conditionally freeing `rev.pending.objects`, just call
> `object_array_clear()` on `rev.pending`. This means we don't poke as
> much into the implementation, which is already a good thing, but also
> that we free the individual entries as well, thereby fixing a
> memory-leak.
>
> Signed-off-by: Martin Ågren <martin.agren@gmail.com>
> ---
> diff-lib.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/diff-lib.c b/diff-lib.c
> index 2a52b07..4e0980c 100644
> --- a/diff-lib.c
> +++ b/diff-lib.c
> @@ -549,7 +549,6 @@ int index_differs_from(const char *def, int diff_flags,
> rev.diffopt.flags |= diff_flags;
> rev.diffopt.ita_invisible_in_index = ita_invisible_in_index;
> run_diff_index(&rev, 1);
> - if (rev.pending.alloc)
> - free(rev.pending.objects);
> + object_array_clear(&rev.pending);
Looks good. A similar bug was the exact reason for adding the function
in 46be82312. I did a grep for 'free.*\.objects' to see if there were
other cases.
There are some hits. E.g., the one in orphaned_commit_warning(). It does
something funny with setting revs.leak_pending. But I _think_ after the
whole thing is done and we call free(refs.objects), that probably ought
to be an object_array_clear().
As I suspect you're working your way through leak-checker results, I'm
OK if you want to punt on digging into more cases for now and just fix
ones that the tool has identified as real leaks.
-Peff
next prev parent reply other threads:[~2017-09-20 20:02 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-20 19:47 [PATCH] diff-lib: clear `pending` object-array in `index_differs_from()` Martin Ågren
2017-09-20 20:02 ` Jeff King [this message]
2017-09-21 3:56 ` Martin Ågren
2017-09-21 4:52 ` Jeff King
2017-09-22 23:34 ` [PATCH v2 0/6] reroll ma/plugleaks; more `object_array`-fixes Martin Ågren
2017-09-22 23:34 ` [PATCH v2 1/6] builtin/commit: fix memory leak in `prepare_index()` Martin Ågren
2017-09-22 23:34 ` [PATCH v2 2/6] commit: fix memory leak in `reduce_heads()` Martin Ågren
2017-09-22 23:34 ` [PATCH v2 3/6] leak_pending: use `object_array_clear()`, not `free()` Martin Ågren
2017-09-23 3:47 ` Jeff King
2017-09-22 23:34 ` [PATCH v2 4/6] object_array: " Martin Ågren
2017-09-23 4:04 ` Jeff King
2017-09-23 9:41 ` Martin Ågren
2017-09-22 23:34 ` [PATCH v2 5/6] object_array: add and use `object_array_pop()` Martin Ågren
2017-09-23 4:27 ` Jeff King
2017-09-23 9:49 ` Martin Ågren
2017-09-23 15:47 ` Jeff King
2017-09-22 23:34 ` [PATCH v2 6/6] pack-bitmap[-write]: use `object_array_clear()`, don't leak Martin Ågren
2017-09-23 4:35 ` Jeff King
2017-09-23 4:37 ` [PATCH v2 0/6] reroll ma/plugleaks; more `object_array`-fixes Jeff King
2017-09-23 9:54 ` Martin Ågren
2017-09-23 16:13 ` Jeff King
2017-09-23 16:38 ` Jeff King
2017-09-24 19:59 ` Martin Ågren
2017-09-25 16:08 ` Jeff King
2017-10-01 15:04 ` Martin Ågren
2017-09-24 7:01 ` Junio C Hamano
2017-09-24 20:00 ` Martin Ågren
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=20170920200229.bc4yniz6otng2zyz@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=martin.agren@gmail.com \
--cc=s-beyer@gmx.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).