Merge pull request #2184 from dscho/address-coverity-report

Fix some issues reported by Coverity

Author: dscho

builtin/bisect--helper.c

@@ -571,7 +571,10 @@ static int bisect_start(struct bisect_terms *terms, int no_checkout,
 	write_file(git_path_bisect_start(), "%s\n", start_head.buf);
 
 	if (no_checkout) {
-		get_oid(start_head.buf, &oid);
+		if (get_oid(start_head.buf, &oid) < 0) {
+			retval = error(_("invalid ref: '%s'"), start_head.buf);
+			goto finish;
+		}
 		if (update_ref(NULL, "BISECT_HEAD", &oid, NULL, 0,
 			       UPDATE_REFS_MSG_ON_ERR)) {
 			retval = -1;

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);

builtin/rebase.c

@@ -848,7 +848,7 @@ static int rebase_config(const char *var, const char *value, void *data)
 		if (git_config_bool(var, value))
 			opts->flags |= REBASE_DIFFSTAT;
 		else
-			opts->flags &= !REBASE_DIFFSTAT;
+			opts->flags &= ~REBASE_DIFFSTAT;
 		return 0;
 	}
 

sequencer.c

@@ -4884,7 +4884,8 @@ int complete_action(struct repository *r, struct replay_opts *opts, unsigned fla
 	struct object_id oid;
 	struct stat st;
 
-	get_oid(onto, &oid);
+	if (get_oid(onto, &oid) < 0)
+		return error(_("invalid rev: '%s'"), onto);
 	shortonto = find_unique_abbrev(&oid, DEFAULT_ABBREV);
 
 	if (!lstat(todo_file, &st) && st.st_size == 0 &&