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

Re: [PATCH 09/11] bisect: check strbuf_getline_lf return when reading terms

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Aug 5, 2026, 14:33 UTC
Message-ID
<282a9a4e-46bc-a790-e801-970d3a52468b@gmx.de>
In-Reply-To
<xmqqcxwii6wd.fsf@gitster.g>
Hi Junio,
On Sun, 19 Jul 2026, Junio C Hamano wrote:
Show 56 quoted lines
> Junio C Hamano <gitster@pobox.com> writes:
> 
> > "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
> > writes:
> > ...
> >> diff --git a/builtin/bisect.c b/builtin/bisect.c
> >> index 798e28f501..fe66d84382 100644
> >> --- a/builtin/bisect.c
> >> +++ b/builtin/bisect.c
> >> @@ -498,9 +498,15 @@ static int get_terms(struct bisect_terms *terms)
> >>  	}
> >>  
> >>  	free_terms(terms);
> >> -	strbuf_getline_lf(&str, fp);
> >> +	if (strbuf_getline_lf(&str, fp) == EOF) {
> >> +		res = -1;
> >> +		goto finish;
> >> +	}
> >>  	terms->term_bad = strbuf_detach(&str, NULL);
> >> -	strbuf_getline_lf(&str, fp);
> >> +	if (strbuf_getline_lf(&str, fp) == EOF) {
> >> +		res = -1;
> >> +		goto finish;
> >> +	}
> >
> > We want to clean-up terms->term_bad when we fail to read the second
> > line after reading the first line successfully, no?
> >
> >>  	terms->term_good = strbuf_detach(&str, NULL);
> >>  
> >>  finish:
> 
> --- >8 ---
> Subject: [PATCH] fixup! bisect: check strbuf_getline_lf return when reading
>  terms
> 
> https://lore.kernel.org/git/xmqqh5m1qcfh.fsf@gitster.g/
> 
> This fixes the immediate leak introduced by
> 
> https://lore.kernel.org/git/17c382fdf46eada79ce03a7604dd7e0454d8bea4.1784069325.git.gitgitgadget@gmail.com/
> 
> but many callers of get_terms() should all be fixed to check for
> return value.  If it fails to grab the replacement word for "bad",
> both terms->term_bad and terms->term_good are left NULL, since the
> function calls free_terms() early.
> 
> diff --git a/builtin/bisect.c b/builtin/bisect.c
> index fe66d84382..69ab7ea248 100644
> --- a/builtin/bisect.c
> +++ b/builtin/bisect.c
> @@ -505,6 +505,7 @@ static int get_terms(struct bisect_terms *terms)
>  	terms->term_bad = strbuf_detach(&str, NULL);
>  	if (strbuf_getline_lf(&str, fp) == EOF) {
>  		res = -1;
> +		FREE_AND_NULL(terms->term_bad);
Good catch!

Thank you, Johannes

>  		goto finish;
>  	}
>  	terms->term_good = strbuf_detach(&str, NULL);
> 
Previous: Junio C HamanoNext: Johannes Schindelin via GitGitGadget
Message 20 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.