Re: [PATCH 4/4] bundle: keep around names passed to add_pending_object()
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 1, 2012, 22:05 UTC
- Message-ID
- <7vehtckmee.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <6fba13f255f76481dc9098b5e8fbb33bd10735cb.1330637923.git.trast@student.ethz.ch>
Thomas Rast <trast@student.ethz.ch> writes:
Show 8 quoted lines
> 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.
Show 10 quoted lines
> 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.