diff options
| author | Elijah Newren <newren@gmail.com> | 2018-05-24 06:27:33 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-25 01:46:42 (GMT) |
| commit | 0ed556d38f90f940fdd2d9e6360b4a7544cd34e8 (patch) | |
| tree | 75542f8e12d2fd651100b0420e7f3af2a60f9930 /t/t6101-rev-parse-parents.sh | |
| parent | d32eb83c1db7d0a8bb54fe743c6d1dd674d372c5 (diff) | |
| download | git-0ed556d38f90f940fdd2d9e6360b4a7544cd34e8.zip git-0ed556d38f90f940fdd2d9e6360b4a7544cd34e8.tar.gz git-0ed556d38f90f940fdd2d9e6360b4a7544cd34e8.tar.bz2 | |
rev-parse: check lookup'ed commit references for NULL
Commits 2122f8b963d4 ("rev-parse: Add support for the ^! and ^@ syntax",
2008-07-26) and 3dd4e7320d ("Teach rev-parse the ... syntax.", 2006-07-04)
taught rev-parse new syntax, and used lookup_commit_reference() as part of
their logic. Neither usage checked the returned commit to see if it was
non-NULL before using it. Check for NULL and ensure an appropriate error
is reported to the user.
Reported by Florian Weimer and Todd Zullinger.
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Elijah Newren <newren@gmail.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6101-rev-parse-parents.sh')
| -rwxr-xr-x | t/t6101-rev-parse-parents.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t6101-rev-parse-parents.sh b/t/t6101-rev-parse-parents.sh index 8c61798..7683e4a 100755 --- a/t/t6101-rev-parse-parents.sh +++ b/t/t6101-rev-parse-parents.sh @@ -214,4 +214,12 @@ test_expect_success 'rev-list merge^-1x (garbage after ^-1)' ' test_must_fail git rev-list merge^-1x ' +test_expect_success 'rev-parse $garbage^@ does not segfault' ' + test_must_fail git rev-parse $EMPTY_TREE^@ +' + +test_expect_success 'rev-parse $garbage...$garbage does not segfault' ' + test_must_fail git rev-parse $EMPTY_TREE...$EMPTY_BLOB +' + test_done |