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

[PATCH 11/11] shallow: fix NULL dereference

From
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
Date
Jul 9, 2026, 09:42 UTC
Message-ID
<9f3a23948475eaa382e9507543fe08d933a4a461.1783590159.git.gitgitgadget@gmail.com>
In-Reply-To
<pull.2174.git.1783590159.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>

After `write_one_shallow()` calls `lookup_commit()` to find the commit object for a shallow graft entry, it then checks `if (!c || ...)`. Inside that block, when the VERBOSE flag is set, it prints the OID being removed, via `c->object.oid`. But `c` can be NULL (the first condition in the `||` check).

This happens when a shallow graft entry references a commit object that is not in the object store (e.g., after a partial fetch or in a corrupted repository). In that case, `lookup_commit()` returns NULL because the object cannot be found, the SEEN_ONLY check correctly decides to remove this entry from .git/shallow, but the verbose message crashes before the removal can complete.

Use `graft->oid` instead of `c->object.oid` for the message. The graft entry's OID is the same value (it was used as the lookup key) and is always available regardless of whether the commit object exists.

Pointed out by Coverity.
Assisted-by: Claude Opus 4.6
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 shallow.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/shallow.c b/shallow.c
index 07cae44ae5..3d2230351e 100644
--- a/shallow.c
+++ b/shallow.c
@@ -371,7 +371,7 @@ static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
 		if (!c || !(c->object.flags & SEEN)) {
 			if (data->flags & VERBOSE)
 				printf("Removing %s from .git/shallow\n",
-				       oid_to_hex(&c->object.oid));
+				       oid_to_hex(&graft->oid));
 			return 0;
 		}
 	}
-- 
gitgitgadget
Previous: Junio C HamanoNext: Junio C Hamano
Message 21 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.