[PATCH] commit parsing: replace unchecked parse_commit by parse_commit_or_die
- From
Stefan Beller <sbeller@google.com>
- Date
- Oct 20, 2016, 18:06 UTC
- Message-ID
- <20161020180629.11955-1-sbeller@google.com>
- In-Reply-To
- <xmqqoa2ehp5u.fsf@gitster.mtv.corp.google.com>
The reason parse_commit() would fail at these points would be because the repository is corrupt.
This was noticed by coverity.
Signed-off-by: Stefan Beller <sbeller@google.com> ---
developed on pu as that's where coverity spotted it. I have no overview if these areas are being worked on. (It may clash with at least jc/merge-base-fp-only) Thanks, Stefan
builtin/blame.c | 2 +- builtin/describe.c | 4 ++-- builtin/name-rev.c | 2 +- builtin/show-branch.c | 4 ++-- commit.c | 2 +- fetch-pack.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/builtin/blame.c b/builtin/blame.c index 992a79c..3b8564c 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -1801,7 +1801,7 @@ static void assign_blame(struct scoreboard *sb, int opt) * so hold onto it in the meantime. */ origin_incref(suspect); - parse_commit(commit); + parse_commit_or_die(commit); if (reverse || (!(commit->object.flags & UNINTERESTING) && !(revs->max_age != -1 && commit->date < revs->max_age))) diff --git a/builtin/describe.c b/builtin/describe.c index 01490a1..8299b16 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -199,7 +199,7 @@ static unsigned long finish_depth_computation( best->depth++; while (parents) { struct commit *p = parents->item; - parse_commit(p); + parse_commit_or_die(p); if (!(p->object.flags & SEEN)) commit_list_insert_by_date(p, list); p->object.flags |= c->object.flags; @@ -322,7 +322,7 @@ static void describe(const char *arg, int last_one) } while (parents) { struct commit *p = parents->item; - parse_commit(p); + parse_commit_or_die(p); if (!(p->object.flags & SEEN)) commit_list_insert_by_date(p, &list); p->object.flags |= c->object.flags; diff --git a/builtin/name-rev.c b/builtin/name-rev.c index cd89d48..92c3316 100644 --- a/builtin/name-rev.c +++ b/builtin/name-rev.c @@ -29,7 +29,7 @@ static void name_rev(struct commit *commit, struct commit_list *parents; int parent_number = 1; - parse_commit(commit); + parse_commit_or_die(commit); if (commit->date < cutoff) return; diff --git a/builtin/show-branch.c b/builtin/show-branch.c index 974f340..fd911b5 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -218,7 +218,7 @@ static void join_revs(struct commit_list **list_p, parents = parents->next; if ((this_flag & flags) == flags) continue; - parse_commit(p); + parse_commit_or_die(p); if (mark_seen(p, seen_p) && !still_interesting) extra--; p->object.flags |= flags; @@ -835,7 +835,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) if (!commit) die(_("cannot find commit %s (%s)"), ref_name[num_rev], oid_to_hex(&revkey)); - parse_commit(commit); + parse_commit_or_die(commit); mark_seen(commit, &seen); /* rev#0 uses bit REV_SHIFT, rev#1 uses bit REV_SHIFT+1, diff --git a/commit.c b/commit.c index b9c0c81..5b23eaf 100644 --- a/commit.c +++ b/commit.c @@ -910,7 +910,7 @@ static void mark_redundant(struct commit **array, int cnt) ALLOC_ARRAY(filled_index, cnt - 1); for (i = 0; i < cnt; i++) - parse_commit(array[i]); + parse_commit_or_die(array[i]); for (i = 0; i < cnt; i++) { struct commit_list *common; diff --git a/fetch-pack.c b/fetch-pack.c index cb45c34..8b4ab47 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -159,7 +159,7 @@ static const unsigned char *get_rev(void) return NULL; commit = prio_queue_get(&rev_list); - parse_commit(commit); + parse_commit_or_die(commit); parents = commit->parents; commit->object.flags |= POPPED;
-- 2.10.1.448.g862ec83.dirty