All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
	Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH 11/14] inherit_tracking(): defensive programming
Date: Thu, 15 May 2025 12:45:36 +0000	[thread overview]
Message-ID: <dec21f89ffd06d8b307e7f46191be3824bd99b96.1747313140.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1890.git.1747313139.gitgitgadget@gmail.com>

From: Johannes Schindelin <johannes.schindelin@gmx.de>

CodeQL points out that `branch_get()` can return NULL values.

Note that the error path in this instance calls `BUG()`, not `die()`,
for two reasons:

1. The code lives in `libgit.a` and calling `die()` from within those
   library functions is a bad practice that needs to be reduced, rather
   than increased.

2. The `inherit_tracking()` function really should only be called with
   the name of an existing branch, therefore a `NULL` return value would
   indeed constitute a bug in Git's code.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 branch.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/branch.c b/branch.c
index 91297d55ac9f..a10b6119b214 100644
--- a/branch.c
+++ b/branch.c
@@ -224,6 +224,8 @@ static int inherit_tracking(struct tracking *tracking, const char *orig_ref)
 	skip_prefix(orig_ref, "refs/heads/", &bare_ref);
 
 	branch = branch_get(bare_ref);
+	if (!branch)
+		BUG("could not get branch for '%s", bare_ref);
 	if (!branch->remote_name) {
 		warning(_("asked to inherit tracking from '%s', but no remote is set"),
 			bare_ref);
-- 
gitgitgadget


  parent reply	other threads:[~2025-05-15 12:45 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-15 12:45 [PATCH 00/14] Some defensive programming Johannes Schindelin via GitGitGadget
2025-05-15 12:45 ` [PATCH 01/14] revision: " Johannes Schindelin via GitGitGadget
2025-05-15 17:13   ` Junio C Hamano
2025-05-15 12:45 ` [PATCH 02/14] get_parent(): " Johannes Schindelin via GitGitGadget
2025-05-15 17:21   ` Junio C Hamano
2025-05-15 20:32   ` Jeff King
2025-05-15 12:45 ` [PATCH 03/14] fetch-pack: " Johannes Schindelin via GitGitGadget
2025-05-15 17:24   ` Junio C Hamano
2025-05-15 12:45 ` [PATCH 04/14] unparse_commit(): " Johannes Schindelin via GitGitGadget
2025-05-15 12:45 ` [PATCH 05/14] verify_commit_graph(): " Johannes Schindelin via GitGitGadget
2025-05-15 12:45 ` [PATCH 06/14] stash: " Johannes Schindelin via GitGitGadget
2025-05-15 12:45 ` [PATCH 07/14] " Johannes Schindelin via GitGitGadget
2025-05-15 12:45 ` [PATCH 08/14] push: " Johannes Schindelin via GitGitGadget
2025-05-15 12:45 ` [PATCH 09/14] fetch: " Johannes Schindelin via GitGitGadget
2025-05-15 12:45 ` [PATCH 10/14] describe: " Johannes Schindelin via GitGitGadget
2025-05-15 12:45 ` Johannes Schindelin via GitGitGadget [this message]
2025-05-15 12:45 ` [PATCH 12/14] submodule: check return value of `submodule_from_path()` Johannes Schindelin via GitGitGadget
2025-05-15 12:45 ` [PATCH 13/14] test-tool repository: check return value of `lookup_commit()` Johannes Schindelin via GitGitGadget
2025-05-15 12:45 ` [PATCH 14/14] shallow: handle missing shallow commits gracefully Johannes Schindelin via GitGitGadget

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=dec21f89ffd06d8b307e7f46191be3824bd99b96.1747313140.git.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=johannes.schindelin@gmx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.