From: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org, "Junio C Hamano" <gitster@pobox.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Adam Spiers" <git@adamspiers.org>,
"Ramkumar Ramachandra" <artagnon@gmail.com>,
"Stephen Boyd" <sboyd@codeaurora.org>
Subject: Re: [PATCH v2 3/3] unpack-trees: free created cache entries
Date: Thu, 30 May 2013 16:49:20 +0200 [thread overview]
Message-ID: <51A766F0.3030408@lsrfire.ath.cx> (raw)
In-Reply-To: <1369920861-30030-4-git-send-email-felipe.contreras@gmail.com>
Am 30.05.2013 15:34, schrieb Felipe Contreras:
> We created them, and nobody else is going to destroy them.
>
> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> ---
> unpack-trees.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/unpack-trees.c b/unpack-trees.c
> index eff2944..9f19d01 100644
> --- a/unpack-trees.c
> +++ b/unpack-trees.c
> @@ -590,8 +590,16 @@ static int unpack_nondirectories(int n, unsigned long mask,
> src[i + o->merge] = create_ce_entry(info, names + i, stage);
> }
>
> - if (o->merge)
> - return call_unpack_fn(src, o);
> + if (o->merge) {
> + int ret = call_unpack_fn(src, o);
> + for (i = 0; i < n; i++) {
> + struct cache_entry *ce = src[i + o->merge];
> + if (!ce || ce == o->df_conflict_entry)
> + continue;
> + free(ce);
> + }
> + return ret;
> + }
Ah, now I understand what you meant in that other email. That works as
well, of course. It's slightly nicer on the eye, admittedly.
René
prev parent reply other threads:[~2013-05-30 14:49 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-30 13:34 [PATCH v2 0/3] cherry-pick: fix memory leaks Felipe Contreras
2013-05-30 13:34 ` [PATCH v2 1/3] read-cache: plug a few leaks Felipe Contreras
2013-05-30 15:13 ` René Scharfe
2013-05-31 3:40 ` Felipe Contreras
2013-05-31 8:22 ` Felipe Contreras
2013-05-30 13:34 ` [PATCH v2 2/3] unpack-trees: plug a memory leak Felipe Contreras
2013-05-30 13:40 ` Stefano Lattarini
2013-05-30 13:34 ` [PATCH v2 3/3] unpack-trees: free created cache entries Felipe Contreras
2013-05-30 14:49 ` René Scharfe [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=51A766F0.3030408@lsrfire.ath.cx \
--to=rene.scharfe@lsrfire.ath.cx \
--cc=artagnon@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@adamspiers.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=sboyd@codeaurora.org \
/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).