list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: "René Scharfe" <>
To: Git Mailing List <>
Cc: Junio C Hamano <>
Subject: [PATCH] grep: handle deref_tag() returning NULL
Date: Sun, 11 Oct 2020 18:03:28 +0200	[thread overview]
Message-ID: <> (raw)

deref_tag() can return NULL.  Exit gracefully in that case instead
of blindly dereferencing the return value.

.name shouldn't ever be NULL, but grep_object() handles that case
explicitly, so let's be defensive here as well and show the broken
object's ID if it happens to lack a name after all.

Signed-off-by: René Scharfe <>
Patch generated with --function-context for easier review.

 builtin/grep.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/builtin/grep.c b/builtin/grep.c
index c8037388c6..e58e57504c 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -658,31 +658,42 @@ static int grep_object(struct grep_opt *opt, const struct pathspec *pathspec,
 static int grep_objects(struct grep_opt *opt, const struct pathspec *pathspec,
 			const struct object_array *list)
 	unsigned int i;
 	int hit = 0;
 	const unsigned int nr = list->nr;

 	for (i = 0; i < nr; i++) {
 		struct object *real_obj;

 		real_obj = deref_tag(opt->repo, list->objects[i].item,
 				     NULL, 0);

+		if (!real_obj) {
+			char hex[GIT_MAX_HEXSZ + 1];
+			const char *name = list->objects[i].name;
+			if (!name) {
+				oid_to_hex_r(hex, &list->objects[i].item->oid);
+				name = hex;
+			}
+			die(_("invalid object '%s' given."), name);
+		}
 		/* load the gitmodules file for this rev */
 		if (recurse_submodules) {
 		if (grep_object(opt, pathspec, real_obj, list->objects[i].name,
 				list->objects[i].path)) {
 			hit = 1;
 			if (opt->status_only)
 	return hit;

                 reply	other threads:[~2020-10-11 16:04 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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:

  List information:

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

  git send-email \ \ \ \ \
    --subject='Re: [PATCH] grep: handle deref_tag() returning NULL' \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Code repositories for project(s) associated with this inbox:

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).