From: Stefan Sperling <stsp@stsp.name>
To: git@vger.kernel.org
Subject: [PATCH] fix segv with corrupt tag object
Date: Sun, 25 Aug 2019 01:09:44 +0200 [thread overview]
Message-ID: <20190824230944.GA14132@jessup.stsp.name> (raw)
[-- Attachment #1: Type: text/plain, Size: 1080 bytes --]
A tag object which lacks newlines won't be parsed correctly.
Git fails to detect this error and crashes due to a NULL deref:
$ git archive 1.0.0
Segmentation fault (core dumped)
$ git checkout 1.0.0
Segmentation fault (core dumped)
$
See the attached tarball for a reproduction repository.
Also mirrored at https://stsp.name/git-checkout-tag-segv-repo.tgz
With the patch below:
$ git checkout 1.0.0
fatal: reference is not a tree: 1.0.0
$ git archive 1.0.0
fatal: not a tree object: a99665eea5ee50171b5b7249880aa2ae35e35823
$
diff --git a/tree.c b/tree.c
index 4720945e6a..92d8bd57a3 100644
--- a/tree.c
+++ b/tree.c
@@ -252,9 +252,11 @@ struct tree *parse_tree_indirect(const struct object_id *oid)
return (struct tree *) obj;
else if (obj->type == OBJ_COMMIT)
obj = &(get_commit_tree(((struct commit *)obj))->object);
- else if (obj->type == OBJ_TAG)
+ else if (obj->type == OBJ_TAG) {
obj = ((struct tag *) obj)->tagged;
- else
+ if (!obj)
+ return NULL;
+ } else
return NULL;
if (!obj->parsed)
parse_object(the_repository, &obj->oid);
[-- Attachment #2: git-checkout-tag-segv-repo.tgz --]
[-- Type: application/x-tar-gz, Size: 59874 bytes --]
next reply other threads:[~2019-08-24 23:18 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-24 23:09 Stefan Sperling [this message]
2019-08-25 7:52 ` [PATCH] fix segv with corrupt tag object René Scharfe
2019-08-26 11:57 ` Stefan Sperling
2019-08-26 17:20 ` Junio C Hamano
2019-08-26 18:02 ` Stefan Sperling
2019-08-26 18:18 ` Jeff King
2019-08-29 19:06 ` René Scharfe
2019-08-30 16:29 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190824230944.GA14132@jessup.stsp.name \
--to=stsp@stsp.name \
--cc=git@vger.kernel.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).