public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Junio C Hamano <gitster@pobox•com>
To: Stefan Beller <sbeller@google•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCH 2/3] bundle.c: fix memory leak
Date: Tue, 10 Mar 2015 20:57:30 -0700	[thread overview]
Message-ID: <xmqqegowuqxh.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1426031508-7575-1-git-send-email-sbeller@google.com> (Stefan Beller's message of "Tue, 10 Mar 2015 16:51:48 -0700")

Stefan Beller <sbeller@google•com> writes:

> There was one continue statement without an accompanying `free(ref)`.
> Instead of adding that, replace all the free&&continue with a goto
> just after writing the refs, where we'd do the free anyway and then
> reloop.
>
> Signed-off-by: Stefan Beller <sbeller@google•com>
> ---
>  bundle.c | 11 +++++------
>  1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/bundle.c b/bundle.c
> index 2e2dbd5..f732c92 100644
> --- a/bundle.c
> +++ b/bundle.c
> @@ -334,7 +334,7 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs)
>  		if (e->item->flags & UNINTERESTING)
>  			continue;
>  		if (dwim_ref(e->name, strlen(e->name), sha1, &ref) != 1)
> -			continue;
> +			goto skip_write_ref;

Thanks.

I briefly wondered if we need to initialize ref=NULL for this to
work, because dwim_ref() does not need to clear ref when it says
"nothing matches", but the function actually clears it upfront, so
we should be OK.

> ...
> @@ -397,6 +395,7 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs)
>  		write_or_die(bundle_fd, " ", 1);
>  		write_or_die(bundle_fd, display_ref, strlen(display_ref));
>  		write_or_die(bundle_fd, "\n", 1);
> + skip_write_ref:
>  		free(ref);
>  	}

next prev parent reply	other threads:[~2015-03-11  3:57 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-09 16:58 [PATCH 1/3] connect.c: Fix memory leak Stefan Beller
2015-03-09 16:58 ` [PATCH 2/3] bundle.c: fix " Stefan Beller
2015-03-10 22:40   ` Junio C Hamano
2015-03-10 23:08     ` Stefan Beller
2015-03-10 23:17       ` Junio C Hamano
2015-03-10 23:51         ` Stefan Beller
2015-03-11  3:57           ` Junio C Hamano [this message]
2015-03-09 16:58 ` [PATCH 3/3] builtin/help.c: " Stefan Beller
2015-03-10 22:43   ` Junio C Hamano
2015-03-10 23:50     ` Stefan Beller
2015-03-11  3:52       ` Junio C Hamano
2015-03-09 19:23 ` [PATCH 1/3] connect.c: Fix " Torsten Bögershausen
2015-03-10 22:35 ` Junio C Hamano

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqegowuqxh.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=sbeller@google$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox