From: Felipe Contreras <felipe.contreras@gmail.com>
To: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>
Cc: git@vger.kernel.org, Stephen Boyd <sboyd@codeaurora.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2 7/7] unpack-trees: free cache_entry array members for merges
Date: Sun, 2 Jun 2013 12:25:08 -0500 [thread overview]
Message-ID: <CAMP44s2ym5UEPo8kr6YKf1x_P_0L+o_9vWdCTA6MPDQsRy7d1A@mail.gmail.com> (raw)
In-Reply-To: <1370188017-24672-8-git-send-email-rene.scharfe@lsrfire.ath.cx>
On Sun, Jun 2, 2013 at 10:46 AM, René Scharfe
<rene.scharfe@lsrfire.ath.cx> wrote:
> The merge functions duplicate entries as needed and they don't free
> them. Release them in unpack_nondirectories, the same function
> where they were allocated, after we're done.
>
> As suggested by Felipe, use the same loop style (zero-based for loop)
> for freeing as for allocating.
>
> Improved-by: Felipe Contreras <felipe.contreras@gmail.com>
> Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
> ---
> unpack-trees.c | 13 ++++++++++---
> 1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/unpack-trees.c b/unpack-trees.c
> index 2dbc05d..57b4074 100644
> --- a/unpack-trees.c
> +++ b/unpack-trees.c
> @@ -600,9 +600,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((const struct cache_entry * const *)src,
> - o);
> + if (o->merge) {
> + int rc = call_unpack_fn((const struct cache_entry * const *)src,
> + o);
> + for (i = 0; i < n; i++) {
> + struct cache_entry *ce = src[i + o->merge];
> + if (ce != o->df_conflict_entry)
It's possible that ce is NULL, but you didn't add that check because
free(NULL) still works? Or because ce cannot be NULL?
If it's the former, I think it's clearer if we check that ce is not
NULL either way.
Otherwise it's OK by me.
> + free(ce);
> + }
> + return rc;
> + }
--
Felipe Contreras
next prev parent reply other threads:[~2013-06-02 17:25 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-02 15:46 [PATCH v2 0/7] unpack-trees: plug memory leak for merges René Scharfe
2013-06-02 15:46 ` [PATCH v2 1/7] cache: mark cache_entry pointers const René Scharfe
2013-06-02 15:46 ` [PATCH v2 2/7] read-cache: " René Scharfe
2013-06-02 15:46 ` [PATCH v2 3/7] unpack-trees: factor out dup_entry René Scharfe
2013-06-02 15:46 ` [PATCH v2 4/7] unpack-trees: create working copy of merge entry in merged_entry René Scharfe
2013-06-02 15:46 ` [PATCH v2 5/7] diff-lib, read-tree, unpack-trees: mark cache_entry pointers const René Scharfe
2013-06-02 15:46 ` [PATCH v2 6/7] diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const René Scharfe
2013-06-02 15:46 ` [PATCH v2 7/7] unpack-trees: free cache_entry array members for merges René Scharfe
2013-06-02 17:25 ` Felipe Contreras [this message]
2013-06-02 17:54 ` René Scharfe
2013-06-02 17:59 ` Felipe Contreras
2013-06-02 20:26 ` René Scharfe
2013-06-02 22:38 ` Felipe Contreras
2013-06-02 23:06 ` René Scharfe
2013-06-02 23:23 ` Felipe Contreras
2013-06-02 23:47 ` René Scharfe
2013-06-03 0:04 ` Felipe Contreras
2013-06-03 15:59 ` René Scharfe
2013-06-03 16:10 ` Felipe Contreras
2013-06-03 16:57 ` [PATCH v2 8/7] unpack-trees: document that pointer ce can be NULL René Scharfe
2013-06-03 17:40 ` [PATCH v2 7/7] unpack-trees: free cache_entry array members for merges Junio C Hamano
2013-06-03 20:53 ` Felipe Contreras
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=CAMP44s2ym5UEPo8kr6YKf1x_P_0L+o_9vWdCTA6MPDQsRy7d1A@mail.gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=rene.scharfe@lsrfire.ath.cx \
--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).