From d451e84f207635932963bb802e6ba617f86a4cca Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 9 May 2019 12:25:16 +0200 Subject: [PATCH] rebase -i: watch out for invalid `upstream` arguments This was overlooked in 53bbcfbde7c2 (rebase -i: implement the main part of interactive rebase as a builtin, 2018-09-27). Found by Coverity. Signed-off-by: Johannes Schindelin --- builtin/rebase--interactive.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builtin/rebase--interactive.c b/builtin/rebase--interactive.c index 888390f911..728b2a5938 100644 --- a/builtin/rebase--interactive.c +++ b/builtin/rebase--interactive.c @@ -33,7 +33,8 @@ static int get_revision_ranges(const char *upstream, const char *onto, const char *shortrev; struct object_id rev_oid; - get_oid(base_rev, &rev_oid); + if (get_oid(base_rev, &rev_oid) < 0) + return error(_("invalid rev '%s'"), base_rev); shortrev = find_unique_abbrev(&rev_oid, DEFAULT_ABBREV); *shortrevisions = xstrfmt("%s..%s", shortrev, shorthead);