From: "Shawn O. Pearce" <spearce@spearce.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 01/11] Fix memory leak in traverse_commit_list
Date: Sun, 11 Nov 2007 00:17:42 -0500 [thread overview]
Message-ID: <20071111051742.GT14735@spearce.org> (raw)
In-Reply-To: <7vmytnqbu2.fsf@gitster.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> wrote:
> "Shawn O. Pearce" <spearce@spearce.org> writes:
>
> > diff --git a/list-objects.c b/list-objects.c
> > index e5c88c2..713bef9 100644
> > --- a/list-objects.c
> > +++ b/list-objects.c
> > @@ -170,4 +170,11 @@ void traverse_commit_list(struct rev_info *revs,
> > }
> > for (i = 0; i < objects.nr; i++)
> > show_object(&objects.objects[i]);
> > + free(objects.objects);
> > + if (revs->pending.nr) {
> > + revs->pending.nr = 0;
> > + revs->pending.alloc = 0;
> > + revs->pending.objects = NULL;
> > + free(revs->pending.objects);
> > + }
> > }
>
> It is locally verifiable that objects.objects are no longer
> needed after this point, but it made me a bit nervous about
> freeing of revs->pending.objects.
>
> I think the existing callers are all Ok, but somebody else
> should double check.
There are 5 calllers:
* builtin-fetch.c:
This one I added with my series. It doesn't care about the
pending object list.
* builtin-pack-objects.c:
This doesn't care about the pending list after the call to
traverse_commit_list.
* builtin-rev-list.c (2):
Two calls; the first one is for the bisect case where we print
bisect stats and then return 0 and the second is the end of
the program for the non-bisect case. Neither cares about the
pending list.
* upload-pack.c:
This is called in the async thread spawned by upload-pack to
feed pack-objects. The last thing the async thread does is run
traverse_commit_list, at which point it exits. I actually have
to wonder why we didn't just teach this trick to pack-objects
so we could avoid the async complexity here in upload-pack.
So yea, the cleanup here is safe, assuming I didn't make the
extremely obvious leak of setting to NULL then calling free()
(as Dscho pointed out).
--
Shawn.
prev parent reply other threads:[~2007-11-11 5:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-09 11:06 [PATCH 01/11] Fix memory leak in traverse_commit_list Shawn O. Pearce
2007-11-09 22:43 ` Junio C Hamano
2007-11-09 23:51 ` Johannes Schindelin
2007-11-11 5:17 ` Shawn O. Pearce [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071111051742.GT14735@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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 NNTP newsgroup(s).