From: Derrick Stolee <stolee@gmail.com>
To: Taylor Blau <me@ttaylorr.com>, git@vger.kernel.org
Cc: gitster@pobox.com, peff@peff.net
Subject: Re: [PATCH 1/3] t/t5318: introduce failing 'git commit-graph write' tests
Date: Fri, 6 Sep 2019 12:48:11 -0400 [thread overview]
Message-ID: <6035f5bf-3d09-f454-f9f6-c882bc0604c9@gmail.com> (raw)
In-Reply-To: <042a8ba8b2a98c269f9cd1a8e88488b80d686f0d.1567720960.git.me@ttaylorr.com>
On 9/5/2019 6:04 PM, Taylor Blau wrote:
> When invoking 'git commit-graph' in a corrupt repository, one can cause
> a segfault when ancestral commits are corrupt in one way or another.
> This is due to two function calls in the 'commit-graph.c' code that may
> return NULL, but are not checked for NULL-ness before dereferencing.
>
> Before fixing the bug, introduce two failing tests that demonstrate the
> problem. The first test corrupts an ancestral commit's parent to point
> to a non-existent object. The second test instead corrupts an ancestral
> tree by removing the 'tree' information entirely from the commit. Both
> of these cases cause segfaults, each at different lines.
Thanks for the tests! And marking them as "test_expect_failure" avoids
issues with 'git bisect' in the future.
-Stolee
>
> Signed-off-by: Taylor Blau <me@ttaylorr.com>
> ---
> t/t5318-commit-graph.sh | 43 +++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 43 insertions(+)
>
> diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh
> index ab3eccf0fa..c855f81930 100755
> --- a/t/t5318-commit-graph.sh
> +++ b/t/t5318-commit-graph.sh
> @@ -585,4 +585,47 @@ test_expect_success 'get_commit_tree_in_graph works for non-the_repository' '
> test_cmp expect actual
> '
>
> +test_expect_failure 'corrupt commit-graph write (broken parent)' '
> + rm -rf repo &&
> + git init repo &&
> + (
> + cd repo &&
> + empty="$(git mktree </dev/null)" &&
> + cat >broken <<-EOF &&
> + tree $empty
> + parent 0000000000000000000000000000000000000000
> + author whatever <whatever@example.com> 1234 -0000
> + committer whatever <whatever@example.com> 1234 -0000
> +
> + broken commit
> + EOF
> + broken="$(git hash-object -w -t commit --literally broken)" &&
> + git commit-tree -p "$broken" -m "good commit" "$empty" >good &&
> + test_must_fail git commit-graph write --stdin-commits \
> + <good 2>test_err &&
> + test_i18ngrep "unable to parse commit" test_err
> + )
> +'
> +
> +test_expect_failure 'corrupt commit-graph write (missing tree)' '
> + rm -rf repo &&
> + git init repo &&
> + (
> + cd repo &&
> + tree="$(git mktree </dev/null)" &&
> + cat >broken <<-EOF &&
> + parent 0000000000000000000000000000000000000000
> + author whatever <whatever@example.com> 1234 -0000
> + committer whatever <whatever@example.com> 1234 -0000
> +
> + broken commit
> + EOF
> + broken="$(git hash-object -w -t commit --literally broken)" &&
> + git commit-tree -p "$broken" -m "good" "$tree" >good &&
> + test_must_fail git commit-graph write --stdin-commits \
> + <good 2>test_err &&
> + test_i18ngrep "unable to get tree for" test_err
> + )
> +'
> +
> test_done
>
next prev parent reply other threads:[~2019-09-06 16:48 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-05 22:04 [PATCH 0/3] commit-graph: harden against various corruptions Taylor Blau
2019-09-05 22:04 ` [PATCH 1/3] t/t5318: introduce failing 'git commit-graph write' tests Taylor Blau
2019-09-06 16:48 ` Derrick Stolee [this message]
2019-09-05 22:04 ` [PATCH 2/3] commit-graph.c: handle commit parsing errors Taylor Blau
2019-09-05 22:04 ` [PATCH 3/3] commit-graph.c: handle corrupt/missing trees Taylor Blau
2019-09-06 6:19 ` Jeff King
2019-09-06 15:42 ` Taylor Blau
2019-09-06 17:34 ` Jeff King
2019-09-06 16:51 ` Derrick Stolee
2019-09-06 17:37 ` Jeff King
2019-09-06 16:57 ` Junio C Hamano
2019-09-06 17:11 ` Junio C Hamano
2019-09-06 17:30 ` Jeff King
2019-09-06 17:28 ` Jeff King
2019-09-09 17:55 ` 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=6035f5bf-3d09-f454-f9f6-c882bc0604c9@gmail.com \
--to=stolee@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
/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).