blame: handle deref_tag() returning NULL
PATCH 1/1 blame: handle deref_tag() returning NULL
Signed-off-by René Scharfe <[email protected]>
--- blame.c | 6 +++--- builtin/blame.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-)
blame.c +3 -3
@@ -2670,7 +2670,7 @@ static struct commit *find_single_final(struct rev_info *revs,if (obj->flags &UNINTERESTING )continue ; obj =deref_tag (revs->repo, obj,NULL ,0 ); -if (obj->type !=OBJ_COMMIT ) +if (!obj || obj->type !=OBJ_COMMIT )die ("Non commit %s?" , revs->pending.objects[i].name);if (found) die("More than one commit to dig from %s and %s?",
@@ -2701,7 +2701,7 @@ static struct commit *dwim_reverse_initial(struct rev_info *revs,/* Is that sole rev a committish? */ obj = revs->pending.objects[0 ].item; obj =deref_tag (revs->repo, obj,NULL ,0 ); -if (obj->type !=OBJ_COMMIT ) +if (!obj || obj->type !=OBJ_COMMIT )return NULL ;/* Do we have HEAD? */
@@ -2737,7 +2737,7 @@ static struct commit *find_single_initial(struct rev_info *revs,if (!(obj->flags &UNINTERESTING ))continue ; obj =deref_tag (revs->repo, obj,NULL ,0 ); -if (obj->type !=OBJ_COMMIT ) +if (!obj || obj->type !=OBJ_COMMIT )die ("Non commit %s?" , revs->pending.objects[i].name);if (found) die("More than one commit to dig up from, %s and %s?",
builtin/blame.c +2 -0
@@ -820,6 +820,8 @@ static int peel_to_commit_oid(struct object_id *oid_ret, void *cbdata)if (kind !=OBJ_TAG )return -1 ; obj =deref_tag (r,parse_object (r, &oid),NULL ,0 ); +if (!obj) +return -1 ;oidcpy (&oid, &obj->oid); } }
--
2.28.0