From: Junio C Hamano <gitster@pobox.com>
To: Jim Meyering <jim@meyering.net>
Cc: git list <git@vger.kernel.org>,
Matthew Farrellee <mfarrellee@redhat.com>
Subject: Re: [PATCH] Don't dereference NULL upon lookup_tree failure.
Date: Fri, 21 Dec 2007 14:48:32 -0800 [thread overview]
Message-ID: <7v4peb4qbj.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <873atvwueq.fsf@rho.meyering.net> (Jim Meyering's message of "Fri, 21 Dec 2007 23:32:45 +0100")
Jim Meyering <jim@meyering.net> writes:
> When running on an x86_64 system (either debian unstable or rawhide)
> I see only this:
>
> 0 blocks
> error: Object 0d57588da39d10795486bd5451bc2660832228e6 is a commit, not a tree
> fatal: The remote end hung up unexpectedly
>...
> diff --git a/object.c b/object.c
> index 16793d9..eb59550 100644
> --- a/object.c
> +++ b/object.c
> @@ -142,10 +142,14 @@ struct object *parse_object_buffer(const unsigned char *sha1, enum object_type t
> obj = &blob->object;
> } else if (type == OBJ_TREE) {
> struct tree *tree = lookup_tree(sha1);
> - obj = &tree->object;
> - if (!tree->object.parsed) {
> - parse_tree_buffer(tree, buffer, size);
> - eaten = 1;
> + if (!tree)
> + obj = NULL;
> + else {
> + obj = &tree->object;
> + if (!tree->object.parsed) {
> + parse_tree_buffer(tree, buffer, size);
> + eaten = 1;
> + }
> }
> } else if (type == OBJ_COMMIT) {
> struct commit *commit = lookup_commit(sha1);
While this change may be a prudent safeguard, there is something
else going on. Can you provide the callchain that led to the
parse_object_buffer() that gave SHA1 of a commit object with
type set to OBJ_TREE? Which caller does that bogus combination?
next prev parent reply other threads:[~2007-12-21 22:49 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-21 22:32 [PATCH] Don't dereference NULL upon lookup_tree failure Jim Meyering
2007-12-21 22:48 ` Junio C Hamano [this message]
2007-12-21 22:54 ` Jim Meyering
2007-12-21 23:25 ` Junio C Hamano
2007-12-21 23:33 ` Jim Meyering
2007-12-21 23:40 ` Junio C Hamano
2007-12-22 0:15 ` Jim Meyering
2007-12-22 9:25 ` Junio C Hamano
2007-12-22 13:41 ` Jim Meyering
2007-12-22 18:32 ` 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=7v4peb4qbj.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jim@meyering.net \
--cc=mfarrellee@redhat.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).