From: "René Scharfe" <l.s.r@web.de>
To: Git List <git@vger.kernel.org>
Cc: "SZEDER Gábor" <szeder.dev@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"Martin Koegler" <martin.koegler@chello.at>
Subject: [PATCH] fsck: check results of lookup_blob() and lookup_tree() for NULL
Date: Tue, 3 Oct 2017 15:47:56 +0200 [thread overview]
Message-ID: <54f5877b-a143-11c2-d8f6-ff28ed9e7e38@web.de> (raw)
In-Reply-To: <19a08fb1-2fb3-f368-772b-36646a179975@web.de>
Am 03.10.2017 um 14:51 schrieb René Scharfe:
> Am 03.10.2017 um 12:22 schrieb SZEDER Gábor:
>> Furthermore, fsck.c:fsck_walk_tree() does the same "immediately
>> reference the object member in lookup_blob()'s and lookup_tree()'s
>> return value" thing. I think those should receive the same treatment
>> as well.
>
> Hmm, are put_object_name() and all the walk() implementations ready for
> a NULL object handed to them? Or would we rather need to error out
> right there?
How about this?
-- >8 --
lookup_blob() and lookup_tree() can return NULL if they find an object
of an unexpected type. Error out of fsck_walk_tree() in that case, like
we do when encountering a bad file mode. An error message is already
shown by object_as_type(), which gets called by the lookup functions.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
---
fsck.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/fsck.c b/fsck.c
index 2ad00fc4d0..561a13ac27 100644
--- a/fsck.c
+++ b/fsck.c
@@ -358,14 +358,20 @@ static int fsck_walk_tree(struct tree *tree, void *data, struct fsck_options *op
continue;
if (S_ISDIR(entry.mode)) {
- obj = &lookup_tree(entry.oid)->object;
+ struct tree *tree = lookup_tree(entry.oid);
+ if (!tree)
+ return -1;
+ obj = &tree->object;
if (name)
put_object_name(options, obj, "%s%s/", name,
entry.path);
result = options->walk(obj, OBJ_TREE, data, options);
}
else if (S_ISREG(entry.mode) || S_ISLNK(entry.mode)) {
- obj = &lookup_blob(entry.oid)->object;
+ struct blob *blob = lookup_blob(entry.oid);
+ if (!blob)
+ return -1;
+ obj = &blob->object;
if (name)
put_object_name(options, obj, "%s%s", name,
entry.path);
--
2.14.2
next prev parent reply other threads:[~2017-10-03 13:48 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-01 14:45 [PATCH] tag: avoid NULL pointer arithmetic René Scharfe
2017-10-02 4:13 ` Junio C Hamano
2017-10-02 5:08 ` Jeff King
2017-10-02 13:06 ` René Scharfe
2017-10-02 19:23 ` Jeff King
2017-10-03 10:22 ` SZEDER Gábor
2017-10-03 12:51 ` René Scharfe
2017-10-03 13:47 ` René Scharfe [this message]
2017-10-04 4:00 ` [PATCH] fsck: check results of lookup_blob() and lookup_tree() for NULL Junio C Hamano
2017-10-05 19:41 ` René Scharfe
2017-10-05 19:41 ` [PATCH v2] fsck: handle NULL return of lookup_blob() and lookup_tree() René Scharfe
2017-10-06 2:23 ` Junio C Hamano
2017-10-06 16:21 ` René Scharfe
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54f5877b-a143-11c2-d8f6-ff28ed9e7e38@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.koegler@chello.at \
--cc=szeder.dev@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).