[PATCH 11/14] inherit_tracking(): defensive programming
- From
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
- Date
- May 15, 2025, 12:45 UTC
- Message-ID
- <dec21f89ffd06d8b307e7f46191be3824bd99b96.1747313140.git.gitgitgadget@gmail.com>
- 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