@matheusbsbs / matheus-bagliano / commits / 12736d2f02
Fork 0

parse_commit_buffer(): treat lookup_tree() failure as parse error

If parsing a commit yields a valid tree oid, but we've seen that same oid as a non-tree in the same process, the resulting commit struct will end up with a NULL tree pointer, but not otherwise report a parsing failure. That's perhaps convenient for callers which want to operate on even partially corrupt commits (e.g., by still looking at the parents). But it leaves a potential trap for most callers, who now have to manually check for a NULL tree. Most do not, and it's likely that there are possible segfaults lurking. I say "possible" because there are many candidates, and I don't think it's worth following through on reproducing them when we can just fix them all in one spot. And certainly we _have_ seen real-world cases, such as the one fixed by 806278dead (commit-graph.c: handle corrupt/missing trees, 2019-09-05). Note that we can't quite drop the check in the caller added by that commit yet, as there's some subtlety with repeated parsings (which will be addressed in a future commit). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Oct 18, 2019 at 00:43 UTC 12736d2f027c72d4c900f10ae064d2a673344c9e
1 file changed +7 -1
commit.c
+7 -1
@@ -401,6 +401,7 @@ int parse_commit_buffer(struct repository *r, struct commit *item, const void *b
401 struct commit_graft *graft;
402 const int tree_entry_len = the_hash_algo->hexsz + 5;
403 const int parent_entry_len = the_hash_algo->hexsz + 7;
404 + struct tree *tree;
405
406 if (item->object.parsed)
407 return 0;
@@ -412,7 +413,12 @@ int parse_commit_buffer(struct repository *r, struct commit *item, const void *b
413 if (get_oid_hex(bufptr + 5, &parent) < 0)
414 return error("bad tree pointer in commit %s",
415 oid_to_hex(&item->object.oid));
415 - set_commit_tree(item, lookup_tree(r, &parent));
416 + tree = lookup_tree(r, &parent);
417 + if (!tree)
418 + return error("bad tree pointer %s in commit %s",
419 + oid_to_hex(&parent),
420 + oid_to_hex(&item->object.oid));
421 + set_commit_tree(item, tree);
422 bufptr += tree_entry_len + 1; /* "tree " + "hex sha1" + "\n" */
423 pptr = &item->parents;
424