From: Junio C Hamano <gitster@pobox.com>
To: Thomas Rast <trast@student.ethz.ch>
Cc: <git@vger.kernel.org>
Subject: Re: [PATCH 4/4] bundle: keep around names passed to add_pending_object()
Date: Thu, 01 Mar 2012 14:05:13 -0800 [thread overview]
Message-ID: <7vehtckmee.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <6fba13f255f76481dc9098b5e8fbb33bd10735cb.1330637923.git.trast@student.ethz.ch> (Thomas Rast's message of "Thu, 1 Mar 2012 22:40:51 +0100")
Thomas Rast <trast@student.ethz.ch> writes:
> The 'name' field passed to add_pending_object() is used to later
> deduplicate in object_array_remove_duplicates().
>
> git-bundle had a bug in this area since 18449ab (git-bundle: avoid
> packing objects which are in the prerequisites, 2007-03-08): it passed
> the name of each boundary object in a static buffer. In other words,
> all that object_array_remove_duplicates() saw was the name of the
> *last* added boundary object.
Ouch.
> diff --git a/bundle.c b/bundle.c
> index 7a760db..d9cfd90 100644
> --- a/bundle.c
> +++ b/bundle.c
> @@ -273,7 +273,7 @@ int create_bundle(struct bundle_header *header, const char *path,
> if (!get_sha1_hex(buf.buf + 1, sha1)) {
> struct object *object = parse_object(sha1);
> object->flags |= UNINTERESTING;
> - add_pending_object(&revs, object, buf.buf);
> + add_pending_object(&revs, object, xstrdup(buf.buf));
We'll release &buf after the loop but the elements in the pending object
array will keep their own copies, so now we would be safe.
Thanks for fixing this.
next prev parent reply other threads:[~2012-03-01 22:05 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-01 21:40 [PATCH 0/4] Another bundle fix: reading freed memory Thomas Rast
2012-03-01 21:40 ` [PATCH 1/4] t5510: refactor bundle->pack conversion Thomas Rast
2012-03-01 21:40 ` [PATCH 2/4] t5510: fix indent with spaces Thomas Rast
2012-03-01 21:40 ` [PATCH 3/4] t5510: ensure we stay in the toplevel test dir Thomas Rast
2012-03-01 21:57 ` Junio C Hamano
2012-03-01 22:09 ` Thomas Rast
2012-03-01 22:32 ` Junio C Hamano
2012-03-01 22:33 ` Junio C Hamano
2012-03-01 21:40 ` [PATCH 4/4] bundle: keep around names passed to add_pending_object() Thomas Rast
2012-03-01 22:05 ` Junio C Hamano [this message]
2012-03-01 22:22 ` Thomas Rast
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=7vehtckmee.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=trast@student.ethz.ch \
/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).