Message ID | pull.906.git.git.1604058401991.gitgitgadget@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Fix potential segfault on cloning invalid tag | expand |
On Fri, Oct 30, 2020 at 11:46:41AM +0000, Sohom Datta via GitGitGadget wrote: > From: Sohom Datta <sohom.datta@learner.manipal.edu> > > Git allows users to create tags pointing to object hashes > that may or may not be commits. When a tag that doesn't > point to a commit is used with the -b (--branch) parameter > of git clone, git segfaults as it assumes that the tag will > always reference a commit. > > Add a check to make sure that lookup_commit_reference returns a commit > before detaching HEAD. This seemed eerily familiar, so I dug up these threads: - https://lore.kernel.org/git/20191029092735.GA84120@carpenter.lan/ - https://lore.kernel.org/git/20191101002432.GA49846@carpenter.lan/ The interesting things are: - there are some other cases where we might see a non-commit, which are also worth covering - it would be friendlier to the user to put in a fallback value for HEAD. We already transferred the whole history, so deleting it is a bit less friendly than leaving it in a state the user can recover from locally I think the patches there were moving in a good direction, but it looks like they just got stalled. -Peff
diff --git a/builtin/clone.c b/builtin/clone.c index a0841923cf..b4760ac887 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -727,6 +727,8 @@ static void update_head(const struct ref *our, const struct ref *remote, } else if (our) { struct commit *c = lookup_commit_reference(the_repository, &our->old_oid); + if ( !c ) + die(_("%s does not point to a commit."), our->name); /* --branch specifies a non-branch (i.e. tags), detach HEAD */ update_ref(msg, "HEAD", &c->object.oid, NULL, REF_NO_DEREF, UPDATE_REFS_DIE_ON_ERR); diff --git a/t/t5610-clone-detached.sh b/t/t5610-clone-detached.sh index 8b0d607df1..c7fd2c5f5c 100755 --- a/t/t5610-clone-detached.sh +++ b/t/t5610-clone-detached.sh @@ -15,6 +15,7 @@ test_expect_success 'setup' ' echo two >file && git commit -a -m two && git tag two && + git tag four $(git rev-parse :file) && echo three >file && git commit -a -m three ' @@ -72,5 +73,9 @@ test_expect_success 'cloned HEAD matches' ' test_expect_success 'cloned HEAD is detached' ' head_is_detached detached-orphan ' +test_expect_success 'cloning invalid tag' ' + test_must_fail git clone "file://$PWD" -b four 2>err && + test_i18ngrep "does not point to a commit." err +' test_done