git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v3 11/12] bisect: check get_terms return at all call sites

From
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
Date
Aug 12, 2026, 08:03 UTC
Message-ID
<aefdbe2bdfe7509e1660aa55e46bbdb79ddf619c.1786521801.git.gitgitgadget@gmail.com>
In-Reply-To
<pull.2179.v3.git.1786521801.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>

Six callers of get_terms() silently discard its return value. When get_terms fails (missing or truncated BISECT_TERMS file), the term strings remain NULL or empty, causing confusing downstream behavior: commands like "bisect next" or "bisect run" proceed with empty term strings, producing nonsensical ref names (refs/bisect/ with no suffix) and misleading error messages.

Let's not discard the return value, but handle an error with the same message `bisect_terms()` already uses when reading the terms failed.

Pointed out by Coverity.

There is one slight complication here: One caller _needs_ the return value to indicate an error when the `BISECT_TERMS` file is absent, all the other call sites are totally okay with a "missing" `BISECT_TERMS` file. To address that, extend the function signature of `get_terms()` to indicate which behavior the caller wants.

Assisted-by: Claude Opus 4.6
Helped-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 builtin/bisect.c | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/builtin/bisect.c b/builtin/bisect.c
index 69ab7ea248..ceb60b0626 100644
--- a/builtin/bisect.c
+++ b/builtin/bisect.c
@@ -485,7 +485,7 @@ static int bisect_next_check(const struct bisect_terms *terms,
 	return decide_next(terms, current_term, !state.nr_good, !state.nr_bad);
 }
 
-static int get_terms(struct bisect_terms *terms)
+static int get_terms(struct bisect_terms *terms, int file_missing_is_ok)
 {
 	struct strbuf str = STRBUF_INIT;
 	FILE *fp = NULL;
@@ -493,7 +493,7 @@ static int get_terms(struct bisect_terms *terms)
 
 	fp = fopen(git_path_bisect_terms(), "r");
 	if (!fp) {
-		res = -1;
+		res = file_missing_is_ok ? 0 : -1;
 		goto finish;
 	}
 
@@ -519,7 +519,7 @@ finish:
 
 static int bisect_terms(struct bisect_terms *terms, const char *option)
 {
-	if (get_terms(terms))
+	if (get_terms(terms, 0))
 		return error(_("no terms defined"));
 
 	if (!option) {
@@ -1057,7 +1057,8 @@ static int process_replay_line(struct bisect_terms *terms, struct strbuf *line)
 	rev = word_end + strspn(word_end, " \t");
 	*word_end = '\0'; /* NUL-terminate the word */
 
-	get_terms(terms);
+	if (get_terms(terms, 1))
+		return error(_("no terms defined"));
 	if (check_and_set_terms(terms, p))
 		return -1;
 
@@ -1383,7 +1384,8 @@ static int cmd_bisect__next(int argc, const char **argv UNUSED, const char *pref
 	if (argc)
 		return error(_("'%s' requires 0 arguments"),
 			     "git bisect next");
-	get_terms(&terms);
+	if (get_terms(&terms, 1))
+		return error(_("no terms defined"));
 	res = bisect_next(&terms, prefix);
 	free_terms(&terms);
 	return res;
@@ -1417,7 +1419,8 @@ static int cmd_bisect__skip(int argc, const char **argv, const char *prefix UNUS
 	struct bisect_terms terms = { 0 };
 
 	set_terms(&terms, "bad", "good");
-	get_terms(&terms);
+	if (get_terms(&terms, 1))
+		return error(_("no terms defined"));
 	res = bisect_skip(&terms, argc, argv);
 	free_terms(&terms);
 	return res;
@@ -1429,7 +1432,8 @@ static int cmd_bisect__visualize(int argc, const char **argv, const char *prefix
 	int res;
 	struct bisect_terms terms = { 0 };
 
-	get_terms(&terms);
+	if (get_terms(&terms, 1))
+		return error(_("no terms defined"));
 	res = bisect_visualize(&terms, argc, argv);
 	free_terms(&terms);
 	return res;
@@ -1443,7 +1447,8 @@ static int cmd_bisect__run(int argc, const char **argv, const char *prefix UNUSE
 
 	if (!argc)
 		return error(_("'%s' failed: no command provided."), "git bisect run");
-	get_terms(&terms);
+	if (get_terms(&terms, 1))
+		return error(_("no terms defined"));
 	res = bisect_run(&terms, argc, argv);
 	free_terms(&terms);
 	return res;
@@ -1482,7 +1487,8 @@ int cmd_bisect(int argc,
 			usage_with_options(git_bisect_usage, options);
 
 		set_terms(&terms, "bad", "good");
-		get_terms(&terms);
+		if (get_terms(&terms, 1))
+			return error(_("no terms defined"));
 		if (check_and_set_terms(&terms, argv[0]) ||
 		    !one_of(argv[0], terms.term_good, terms.term_bad, NULL))
 			usage_msg_optf(_("unknown command: '%s'"), git_bisect_usage,
-- 
gitgitgadget
Previous: Johannes Schindelin via GitGitGadgetNext: Johannes Schindelin via GitGitGadget
Message 55 of 60 in “coverity: fix unchecked returns”
  1. 00/11 coverity: fix unchecked returnsJohannes Schindelin via GitGitGadget, Jul 14, 2026
  2. 01/11 http: die on curl_easy_duphandle failure in get_active_slotJohannes Schindelin via GitGitGadget, Jul 14, 2026
  3. 02/11 config: propagate launch_editor() failure in show_editor()Johannes Schindelin via GitGitGadget, Jul 14, 2026
  4. Patrick SteinhardtJul 15, 2026
  5. 03/11 reftable/block: check deflateInit() return valueJohannes Schindelin via GitGitGadget, Jul 14, 2026
  6. 04/11 reftable tests: check reftable_table_init_ref_iterator() returnJohannes Schindelin via GitGitGadget, Jul 14, 2026
  7. 05/11 last-modified: handle repo_parse_commit() failuresJohannes Schindelin via GitGitGadget, Jul 14, 2026
  8. Junio C HamanoJul 15, 2026
  9. Junio C HamanoJul 20, 2026
  10. Johannes SchindelinAug 5, 2026
  11. 06/11 compat/pread: check initial lseek for errorsJohannes Schindelin via GitGitGadget, Jul 14, 2026
  12. Patrick SteinhardtJul 15, 2026
  13. Johannes SchindelinAug 5, 2026
  14. 07/11 transport-helper: check dup() return in get_exporterJohannes Schindelin via GitGitGadget, Jul 14, 2026
  15. Patrick SteinhardtJul 15, 2026
  16. 08/11 transport-helper: warn when export-marks file cannot be finalizedJohannes Schindelin via GitGitGadget, Jul 14, 2026
  17. 09/11 bisect: check strbuf_getline_lf return when reading termsJohannes Schindelin via GitGitGadget, Jul 14, 2026
  18. Junio C HamanoJul 15, 2026
  19. Junio C HamanoJul 20, 2026
  20. Johannes SchindelinAug 5, 2026
  21. 10/11 bisect: check get_terms return at all call sitesJohannes Schindelin via GitGitGadget, Jul 14, 2026
  22. Patrick SteinhardtJul 15, 2026
  23. Johannes SchindelinAug 5, 2026
  24. 11/11 bisect: handle dup() failure when redirecting stdoutJohannes Schindelin via GitGitGadget, Jul 14, 2026
  25. Patrick SteinhardtJul 15, 2026
  26. Johannes SchindelinAug 5, 2026
  27. 00/11 coverity: fix unchecked returnsJohannes Schindelin via GitGitGadget, Aug 5, 2026
  28. 01/11 http: die on curl_easy_duphandle failure in get_active_slotJohannes Schindelin via GitGitGadget, Aug 5, 2026
  29. 02/11 config: propagate launch_editor() failure in show_editor()Johannes Schindelin via GitGitGadget, Aug 5, 2026
  30. 03/11 reftable/block: check deflateInit() return valueJohannes Schindelin via GitGitGadget, Aug 5, 2026
  31. Junio C HamanoAug 6, 2026
  32. 04/11 reftable tests: check reftable_table_init_ref_iterator() returnJohannes Schindelin via GitGitGadget, Aug 5, 2026
  33. 05/11 last-modified: handle repo_parse_commit() failuresJohannes Schindelin via GitGitGadget, Aug 5, 2026
  34. 06/11 compat/pread: check initial lseek for errorsJohannes Schindelin via GitGitGadget, Aug 5, 2026
  35. 07/11 transport-helper: check dup() return in get_exporterJohannes Schindelin via GitGitGadget, Aug 5, 2026
  36. 08/11 transport-helper: warn when export-marks file cannot be finalizedJohannes Schindelin via GitGitGadget, Aug 5, 2026
  37. 09/11 bisect: check strbuf_getline_lf return when reading termsJohannes Schindelin via GitGitGadget, Aug 5, 2026
  38. 10/11 bisect: check get_terms return at all call sitesJohannes Schindelin via GitGitGadget, Aug 5, 2026
  39. Junio C HamanoAug 5, 2026
  40. 11/11 bisect: handle dup() failure when redirecting stdoutJohannes Schindelin via GitGitGadget, Aug 5, 2026
  41. Jeff KingAug 6, 2026
  42. Junio C HamanoAug 6, 2026
  43. 00/12 coverity: fix unchecked returnsJohannes Schindelin via GitGitGadget, Aug 12, 2026
  44. 01/12 http: die on curl_easy_duphandle failure in get_active_slotJohannes Schindelin via GitGitGadget, Aug 12, 2026
  45. 02/12 config: propagate launch_editor() failure in show_editor()Johannes Schindelin via GitGitGadget, Aug 12, 2026
  46. 03/12 reftable: handle block-writer initialization errorsJohannes Schindelin via GitGitGadget, Aug 12, 2026
  47. 04/12 reftable/block: check deflateInit() return valueJohannes Schindelin via GitGitGadget, Aug 12, 2026
  48. 05/12 reftable tests: check reftable_table_init_ref_iterator() returnJohannes Schindelin via GitGitGadget, Aug 12, 2026
  49. 06/12 last-modified: handle repo_parse_commit() failuresJohannes Schindelin via GitGitGadget, Aug 12, 2026
  50. 07/12 compat/pread: check initial lseek for errorsJohannes Schindelin via GitGitGadget, Aug 12, 2026
  51. 08/12 transport-helper: check dup() return in get_exporterJohannes Schindelin via GitGitGadget, Aug 12, 2026
  52. 09/12 transport-helper: warn when export-marks file cannot be finalizedJohannes Schindelin via GitGitGadget, Aug 12, 2026
  53. Patrick SteinhardtAug 13, 2026
  54. 10/12 bisect: check strbuf_getline_lf return when reading termsJohannes Schindelin via GitGitGadget, Aug 12, 2026
  55. 11/12 bisect: check get_terms return at all call sitesJohannes Schindelin via GitGitGadget, Aug 12, 2026
  56. 12/12 bisect: handle dup() failure when redirecting stdoutJohannes Schindelin via GitGitGadget, Aug 12, 2026
  57. Jeff KingAug 12, 2026
  58. Junio C HamanoAug 12, 2026
  59. Jeff KingAug 12, 2026
  60. Patrick SteinhardtAug 13, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.