From: Taylor Blau <me@ttaylorr.com>
To: stolee@gmail.com
Cc: git@vger.kernel.org, peff@peff.net
Subject: [RFC PATCH 1/1] commit-graph.c: die on un-parseable commits
Date: Tue, 3 Sep 2019 22:22:57 -0400 [thread overview]
Message-ID: <34e4ec793cb0d321d16b88777cd2db64ed7b772e.1567563244.git.me@ttaylorr.com> (raw)
In-Reply-To: <cover.1567563244.git.me@ttaylorr.com>
When we write a commit graph chunk, we process a given list of 'struct
commit *'s and parse out the parent(s) and tree OID in order to write
out its information.
We do this by calling 'parse_commit_no_graph', and then checking the
result of 'get_commit_tree_oid' to write the tree OID. This process
assumes that 'parse_commit_no_graph' parses the commit successfully.
When this isn't the case, 'get_commit_tree_oid(*list)' may return NULL,
in which case trying to '->hash' it causes a SIGSEGV.
Instead, teach 'write_graph_chunk_data' to stop when a commit isn't able
to be parsed, at the peril of failing to write a commit-graph.
Signed-off-by: Taylor Blau <me@ttaylorr.com>
---
commit-graph.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/commit-graph.c b/commit-graph.c
index f2888c203b..6aa6998ecd 100644
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -843,7 +843,9 @@ static void write_graph_chunk_data(struct hashfile *f, int hash_len,
uint32_t packedDate[2];
display_progress(ctx->progress, ++ctx->progress_cnt);
- parse_commit_no_graph(*list);
+ if (parse_commit_no_graph(*list))
+ die(_("unable to parse commit %s"),
+ oid_to_hex(&(*list)->object.oid));
hashwrite(f, get_commit_tree_oid(*list)->hash, hash_len);
parent = (*list)->parents;
--
2.22.0
next prev parent reply other threads:[~2019-09-04 2:23 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-04 2:22 [RFC PATCH 0/1] commit-graph.c: handle corrupt commit trees Taylor Blau
2019-09-04 2:22 ` Taylor Blau [this message]
2019-09-04 3:04 ` [RFC PATCH 1/1] commit-graph.c: die on un-parseable commits Jeff King
2019-09-04 21:18 ` Taylor Blau
2019-09-05 6:47 ` Jeff King
2019-09-06 16:48 ` Derrick Stolee
2019-09-06 17:04 ` Jeff King
2019-09-06 17:19 ` Derrick Stolee
2019-09-06 17:20 ` Derrick Stolee
2019-09-05 22:19 ` Junio C Hamano
2019-09-06 6:35 ` Jeff King
2019-09-06 6:56 ` Jeff King
2019-09-06 16:59 ` Junio C Hamano
2019-09-06 17:04 ` Jeff King
2019-09-09 16:39 ` Junio C Hamano
2019-09-09 16:54 ` Jeff King
2019-09-04 18:25 ` [RFC PATCH 0/1] commit-graph.c: handle corrupt commit trees Garima Singh
2019-09-04 21:21 ` Taylor Blau
2019-09-05 6:08 ` Jeff King
2019-09-06 16:48 ` Derrick Stolee
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=34e4ec793cb0d321d16b88777cd2db64ed7b772e.1567563244.git.me@ttaylorr.com \
--to=me@ttaylorr.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=stolee@gmail.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.
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).