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

Re: [PATCH 10/11] bisect: ensure non-NULL `head` before using it

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 10, 2026, 04:01 UTC
Message-ID
<xmqqqzlbfq81.fsf@gitster.g>
In-Reply-To
<428a3a006bbcb165a96495bbc2c5fc04e5b15db4.1783590159.git.gitgitgadget@gmail.com>

"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> writes:

Show 14 quoted lines
> When `refs_resolve_ref_unsafe()` is called to resolve HEAD, and returns
> NULL (e.g., HEAD does not exist as a proper ref), the code falls back to
> `repo_get_oid("HEAD")` to try to resolve the OID directly. If that
> succeeds, execution continues with `head` still set to NULL.
>
> Later, that variable is passed to `repo_get_oid()` and `starts_with()`,
> both of which would dereference the NULL pointer.
>
> The scenario "`refs_resolve_ref_unsafe()` returns NULL but
> `repo_get_oid()` succeeds" can happen when HEAD is a detached bare OID
> that the ref backend cannot resolve symbolically (a potential edge case
> with the reftable backend) but the OID itself is valid. In this case,
> the bisect-start file does not yet exist (this is a fresh "git bisect
> start"), so the else branch is taken with the NULL `head`.

I agree that setting head to the string "HEAD" is a good solution to ensure that !starts_with(), !repo_get_oid(), and skip_prefix() are not called with NULL.

However, I am not sure I understand your "can happen" scenario.

I naively thought that the only case where HEAD does not resolve to an object correctly is when HEAD is a symbolic ref pointing to an unborn branch.

Is the bug in your "can happen" scenario something we can demonstrate? If so, could you add a test to prevent regressions in the future?

Thanks.
Show 27 quoted lines
> Simply assign "HEAD" to `head` as a fallback to address this.
>
> Pointed out by Coverity.
>
> Assisted-by: Claude Opus 4.6
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
>  builtin/bisect.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/builtin/bisect.c b/builtin/bisect.c
> index 6ff600c856..a69771c6d3 100644
> --- a/builtin/bisect.c
> +++ b/builtin/bisect.c
> @@ -811,9 +811,11 @@ static enum bisect_error bisect_start(struct bisect_terms *terms, int argc,
>  	 */
>  	head = refs_resolve_ref_unsafe(get_main_ref_store(the_repository),
>  				       "HEAD", 0, &head_oid, &flags);
> -	if (!head)
> +	if (!head) {
>  		if (repo_get_oid(the_repository, "HEAD", &head_oid))
>  			return error(_("bad HEAD - I need a HEAD"));
> +		head = "HEAD";
> +	}
>  
>  	/*
>  	 * Check if we are bisecting
Previous: Johannes Schindelin via GitGitGadgetNext: Johannes Schindelin via GitGitGadget
Message 20 of 36 in “coverity: avoid dereferencing NULL”
  1. 00/11 coverity: avoid dereferencing NULLJohannes Schindelin via GitGitGadget, Jul 9, 2026
  2. 01/11 diffcore-break: guard against NULLed queue entries in merge loopJohannes Schindelin via GitGitGadget, Jul 9, 2026
  3. Junio C HamanoJul 10, 2026
  4. 02/11 diff: handle NULL return from repo_get_commit_tree()Johannes Schindelin via GitGitGadget, Jul 9, 2026
  5. Junio C HamanoJul 10, 2026
  6. 03/11 remote: guard `remote_tracking()` against NULL remoteJohannes Schindelin via GitGitGadget, Jul 9, 2026
  7. Junio C HamanoJul 10, 2026
  8. 04/11 reftable/stack: guard against NULL list_file in stack_destroyJohannes Schindelin via GitGitGadget, Jul 9, 2026
  9. Junio C HamanoJul 10, 2026
  10. 05/11 mailsplit: move NULL check before first use of file handleJohannes Schindelin via GitGitGadget, Jul 9, 2026
  11. Junio C HamanoJul 10, 2026
  12. 06/11 bisect: handle NULL commit in `bisect_successful()`Johannes Schindelin via GitGitGadget, Jul 9, 2026
  13. Junio C HamanoJul 10, 2026
  14. 07/11 replay: die when --onto does not peel to a commitJohannes Schindelin via GitGitGadget, Jul 9, 2026
  15. 08/11 revision: avoid dereferencing NULL in `add_parents_only()`Johannes Schindelin via GitGitGadget, Jul 9, 2026
  16. Junio C HamanoJul 10, 2026
  17. 09/11 pack-bitmap: handle missing bitmap for base MIDXJohannes Schindelin via GitGitGadget, Jul 9, 2026
  18. Junio C HamanoJul 10, 2026
  19. 10/11 bisect: ensure non-NULL `head` before using itJohannes Schindelin via GitGitGadget, Jul 9, 2026
  20. Junio C HamanoJul 10, 2026
  21. 11/11 shallow: fix NULL dereferenceJohannes Schindelin via GitGitGadget, Jul 9, 2026
  22. Junio C HamanoJul 9, 2026
  23. 00/12 coverity: avoid dereferencing NULLJohannes Schindelin via GitGitGadget, Jul 10, 2026
  24. 02/12 diff: handle NULL return from repo_get_commit_tree()Johannes Schindelin via GitGitGadget, Jul 10, 2026
  25. 03/12 remote: guard `remote_tracking()` against NULL remoteJohannes Schindelin via GitGitGadget, Jul 10, 2026
  26. 01/12 diffcore-break: guard against NULLed queue entries in merge loopJohannes Schindelin via GitGitGadget, Jul 10, 2026
  27. 05/12 mailsplit: move NULL check before first use of file handleJohannes Schindelin via GitGitGadget, Jul 10, 2026
  28. 04/12 reftable/stack: guard against NULL list_file in stack_destroyJohannes Schindelin via GitGitGadget, Jul 10, 2026
  29. 06/12 bisect: handle NULL commit in `bisect_successful()`Johannes Schindelin via GitGitGadget, Jul 10, 2026
  30. 08/12 revision: avoid dereferencing NULL in `add_parents_only()`Johannes Schindelin via GitGitGadget, Jul 10, 2026
  31. 07/12 replay: die when --onto does not peel to a commitJohannes Schindelin via GitGitGadget, Jul 10, 2026
  32. 09/12 pack-bitmap: handle missing bitmap for base MIDXJohannes Schindelin via GitGitGadget, Jul 10, 2026
  33. 10/12 bisect: ensure non-NULL `head` before using itJohannes Schindelin via GitGitGadget, Jul 10, 2026
  34. 11/12 shallow: fix NULL dereferenceJohannes Schindelin via GitGitGadget, Jul 10, 2026
  35. 12/12 shallow: give write_one_shallow() its own hex bufferJohannes Schindelin via GitGitGadget, Jul 10, 2026
  36. Junio C HamanoJul 10, 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.