From: Junio C Hamano <gitster@pobox.com>
To: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH 02/14] get_parent(): defensive programming
Date: Thu, 15 May 2025 10:21:12 -0700 [thread overview]
Message-ID: <xmqq4ixl23jr.fsf@gitster.g> (raw)
In-Reply-To: <35c4870e2c101c9ef72d1657c8f6dd077cecc5fa.1747313140.git.gitgitgadget@gmail.com> (Johannes Schindelin via GitGitGadget's message of "Thu, 15 May 2025 12:45:27 +0000")
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> CodeQL points out that `lookup_commit_reference()` can return NULL
> values.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> object-name.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/object-name.c b/object-name.c
> index 76749fbfe652..ca54dad2f4c8 100644
> --- a/object-name.c
> +++ b/object-name.c
> @@ -1106,7 +1106,7 @@ static enum get_oid_result get_parent(struct repository *r,
> if (ret)
> return ret;
> commit = lookup_commit_reference(r, &oid);
> - if (repo_parse_commit(r, commit))
> + if (!commit || repo_parse_commit(r, commit))
> return MISSING_OBJECT;
Most of the time, the check for "ret" we see in the pre-context,
which is a result of get_oid_1(), would prevent an oid that is not a
valid name for a committish to even reach this code, I would think,
but with possible repository corruption, we may fail to "lookup" the
commit, so this is a good correction, I would think.
Thanks.
> if (!idx) {
> oidcpy(result, &commit->object.oid);
next prev parent reply other threads:[~2025-05-15 17:21 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 [this message]
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 ` [PATCH 11/14] inherit_tracking(): " Johannes Schindelin via GitGitGadget
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=xmqq4ixl23jr.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--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.