@matheusbsbs / matheus-bagliano / commits / 03c660f9e2

bisect: check get_terms return at all call sites

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. Add checks at each call site so that a failed get_terms produces a clear "no terms defined" error, matching the pattern already used in bisect_terms() at line 512. The check tests the term pointers rather than the return value because some callers (bisect skip, legacy bad/good) call set_terms before get_terms, and the set_terms values should survive a get_terms failure. Pointed out by Coverity. Assisted-by: Claude Opus 4.6 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Johannes Schindelin committed Jul 14, 2026 at 22:48 UTC 03c660f9e2d0d040decd63637bf2aea6cba296ff

1 file changed +12

builtin/bisect.c

+12

@@ -1057,6 +1057,8 @@ static int process_replay_line(struct bisect_terms *terms, struct strbuf *line)

1057 *word_end = '\0'; /* NUL-terminate the word */

1058

1059 get_terms(terms);

1060 + if (!terms->term_bad || !terms->term_good)

1061 + return error(_("no terms defined"));

1062 if (check_and_set_terms(terms, p))

1063 return -1;

1064

@@ -1383,6 +1385,8 @@ static int cmd_bisect__next(int argc, const char **argv UNUSED, const char *pref

1385 return error(_("'%s' requires 0 arguments"),

1386 "git bisect next");

1387 get_terms(&terms);

1388 + if (!terms.term_bad || !terms.term_good)

1389 + return error(_("no terms defined"));

1390 res = bisect_next(&terms, prefix);

1391 free_terms(&terms);

1392 return res;

@@ -1417,6 +1421,8 @@ static int cmd_bisect__skip(int argc, const char **argv, const char *prefix UNUS

1421

1422 set_terms(&terms, "bad", "good");

1423 get_terms(&terms);

1424 + if (!terms.term_bad || !terms.term_good)

1425 + return error(_("no terms defined"));

1426 res = bisect_skip(&terms, argc, argv);

1427 free_terms(&terms);

1428 return res;

@@ -1429,6 +1435,8 @@ static int cmd_bisect__visualize(int argc, const char **argv, const char *prefix

1435 struct bisect_terms terms = { 0 };

1436

1437 get_terms(&terms);

1438 + if (!terms.term_bad || !terms.term_good)

1439 + return error(_("no terms defined"));

1440 res = bisect_visualize(&terms, argc, argv);

1441 free_terms(&terms);

1442 return res;

@@ -1443,6 +1451,8 @@ static int cmd_bisect__run(int argc, const char **argv, const char *prefix UNUSE

1451 if (!argc)

1452 return error(_("'%s' failed: no command provided."), "git bisect run");

1453 get_terms(&terms);

1454 + if (!terms.term_bad || !terms.term_good)

1455 + return error(_("no terms defined"));

1456 res = bisect_run(&terms, argc, argv);

1457 free_terms(&terms);

1458 return res;

@@ -1482,6 +1492,8 @@ int cmd_bisect(int argc,

1492

1493 set_terms(&terms, "bad", "good");

1494 get_terms(&terms);

1495 + if (!terms.term_bad || !terms.term_good)

1496 + return error(_("no terms defined"));

1497 if (check_and_set_terms(&terms, argv[0]) ||

1498 !one_of(argv[0], terms.term_good, terms.term_bad, NULL))

1499 usage_msg_optf(_("unknown command: '%s'"), git_bisect_usage,