From: Junio C Hamano <gitster@pobox.com>
To: "Martin Ågren" <martin.agren@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] ref-filter: fix memory leak in `free_array_item()`
Date: Wed, 10 Jul 2019 13:41:16 -0700 [thread overview]
Message-ID: <xmqqr26xsjv7.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20190710183639.4123992-1-martin.agren@gmail.com> ("Martin Ågren"'s message of "Wed, 10 Jul 2019 20:36:39 +0200")
Martin Ågren <martin.agren@gmail.com> writes:
> We treat the `value` pointer as a pointer to a struct and free its `s`
> field. But `value` is in fact an array of structs. As a result, we only
> free the first `s` out of `used_atom_cnt`-many and leak the rest. Make
> sure we free all items in `value`.
Thanks for spotting. We do allocate an array of used_atom_cnt elements
in populate_value() and we need to free them all.
> In the caller, `ref_array_clear()`, this means we need to be careful not
> to zero `used_atom_cnt` until after we've called `free_array_item()`. We
> could move just a single line, but let's keep related things close
> together instead, by first handling `array`, then `used_atom`.
Yup. Looking good.
Thanks.
>
> Signed-off-by: Martin Ågren <martin.agren@gmail.com>
> ---
> ref-filter.c | 14 +++++++++-----
> 1 file changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/ref-filter.c b/ref-filter.c
> index 791f0648a6..1c1a2af880 100644
> --- a/ref-filter.c
> +++ b/ref-filter.c
> @@ -2105,7 +2105,9 @@ static void free_array_item(struct ref_array_item *item)
> {
> free((char *)item->symref);
> if (item->value) {
> - free((char *)item->value->s);
> + int i;
> + for (i = 0; i < used_atom_cnt; i++)
> + free((char *)item->value[i].s);
> free(item->value);
> }
> free(item);
> @@ -2116,14 +2118,16 @@ void ref_array_clear(struct ref_array *array)
> {
> int i;
>
> - for (i = 0; i < used_atom_cnt; i++)
> - free((char *)used_atom[i].name);
> - FREE_AND_NULL(used_atom);
> - used_atom_cnt = 0;
> for (i = 0; i < array->nr; i++)
> free_array_item(array->items[i]);
> FREE_AND_NULL(array->items);
> array->nr = array->alloc = 0;
> +
> + for (i = 0; i < used_atom_cnt; i++)
> + free((char *)used_atom[i].name);
> + FREE_AND_NULL(used_atom);
> + used_atom_cnt = 0;
> +
> if (ref_to_worktree_map.worktrees) {
> hashmap_free(&(ref_to_worktree_map.map), 1);
> free_worktrees(ref_to_worktree_map.worktrees);
prev parent reply other threads:[~2019-07-10 20:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-10 18:36 [PATCH] ref-filter: fix memory leak in `free_array_item()` Martin Ågren
2019-07-10 20:41 ` Junio C Hamano [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=xmqqr26xsjv7.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=martin.agren@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.
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).