diff options
author | John Keeping <john@keeping.me.uk> | 2016-01-16 11:03:05 +0000 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2016-01-17 17:05:00 +0100 |
commit | baa5ad1f80f56d3c0b0095bfb468fab28c9b4982 (patch) | |
tree | 5e23e5f9ebf7bbccbf431e056588442f1a8b924c | |
parent | e64d5e04c3e22e713539da2b06e1052390aed43d (diff) |
ui-log: handle parse_commit() errors
If parse_commit() fails, none of the fields in the commit structure will have been populated so we will dereference NULL when accessing item->tree. There isn't much we can do about the error at this point, but if we return true then we'll try parsing the commit again from print_commit() and we can report an error to the user at that point. Coverity-id: 13801 Signed-off-by: John Keeping <john@keeping.me.uk>
-rw-r--r-- | ui-log.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ui-log.c b/ui-log.c index 4573255..a4dc707 100644 --- a/ui-log.c +++ b/ui-log.c @@ -141,7 +141,9 @@ static int show_commit(struct commit *commit, struct rev_info *revs) /* When we get here we have precisely one parent. */ parent = parents->item; - parse_commit(parent); + /* If we can't parse the commit, let print_commit() report an error. */ + if (parse_commit(parent)) + return 1; files = 0; add_lines = 0; |