Junio C Hamano <gitster@xxxxxxxxx> wrote:
> "Shawn O. Pearce" <spearce@xxxxxxxxxxx> writes:
>
> > I'm starting to suspect heap corruption again in builtin-fetch.
> > This patch alters the malloc() calls we are doing and may be shifting
> > something around just enough in memory to cause a data overwrite or
> > something and that's why this tag just drops out of the linked list?
> > But then why does that happen in the test suite but not outside.
> > Maybe because the test suite is setting environment variables that
> > I'm not and the impact of those combined with these additional
> > mallocs is what is breaking it? *sigh*
Found it. This ain't pretty. Remember, what's failing in the test
suite is we aren't getting "tag-three-file" automatically followed
during fetch. This is an annotated tag referring to a blob.
Here's the *WAY WRONG FIX THAT SHOULD NOT EVER BE APPLIED*:
diff --git a/builtin-fetch.c b/builtin-fetch.c
index 847db73..a935b5a 100644
--- a/builtin-fetch.c
+++ b/builtin-fetch.c
@@ -389,7 +389,7 @@ static struct ref *find_non_local_tags(struct transport *transport,
if (!path_list_has_path(&existing_refs, ref_name) &&
!path_list_has_path(&new_refs, ref_name) &&
- lookup_object(ref->old_sha1)) {
+ has_sha1_file(ref->old_sha1)) {
path_list_insert(ref_name, &new_refs);
rm = alloc_ref(strlen(ref_name) + 1);
(I know Junio knows why this patch shouldn't be applied.
Its exactly why quickfetch calls rev-list --objects...)
The problem here is my quickfetch patch is bypassing the internal
call to fetch-pack. Which means we never do object handshaking,
and thus never allocate struct object* for the things we had been
talking about (because we never talked about them!). Or in the
case of commits, their trees and parents too. Thus the call above
to lookup_object() for a blob fails, as we never tried to parse it
before in fetch-pack.
Now I'm really not sure why we have blob objects allocated into
memory for lookup_object() during fetch-pack, but apparently we do.
At least during this test vector. It doesn't make sense if we are
only talking about commits (and their parents). I'd expect the
root trees to have objects (when the commit buffer was parsed for
graph traversal) but not blobs.
Maybe some smart individual will come up with the right solution to
keep automatic tag following enabled (safely!) while also allowing
us to use quickfetch. There's got to be a solution that doesn't
implicitly rely upon the handshaking we just happened to do with
the remote peer...
Me, I'm off to catch a few hours of sleep.
--
Shawn.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
