diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-10-07 11:32:58 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-10-07 11:32:58 +0900 |
commit | 80693e3f09ab80cfe4a5a83467e765626ad0b15a (patch) | |
tree | 1100110f21941cbe7510a43d41c8121d59761030 /commit.c | |
parent | ae203ba414f7e0b83f8b07255898a6cff3b5c07e (diff) | |
parent | 806278dead57766bf000af62dcb8892ee3a24956 (diff) | |
download | git-80693e3f09ab80cfe4a5a83467e765626ad0b15a.tar.gz |
Merge branch 'tb/commit-graph-harden'
The code to parse and use the commit-graph file has been made more
robust against corrupted input.
* tb/commit-graph-harden:
commit-graph.c: handle corrupt/missing trees
commit-graph.c: handle commit parsing errors
t/t5318: introduce failing 'git commit-graph write' tests
Diffstat (limited to 'commit.c')
-rw-r--r-- | commit.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -358,7 +358,8 @@ struct tree *repo_get_commit_tree(struct repository *r, struct object_id *get_commit_tree_oid(const struct commit *commit) { - return &get_commit_tree(commit)->object.oid; + struct tree *tree = get_commit_tree(commit); + return tree ? &tree->object.oid : NULL; } void release_commit_memory(struct parsed_object_pool *pool, struct commit *c) |