From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Subject: [PATCH] fsck: avoid looking at NULL blob->object
Date: Sat, 9 Jun 2018 04:32:00 -0400 [thread overview]
Message-ID: <20180609083159.GA6158@sigill.intra.peff.net> (raw)
Commit 159e7b080b (fsck: detect gitmodules files,
2018-05-02) taught fsck to look at the content of
.gitmodules files. If the object turns out not to be a blob
at all, we just complain and punt on checking the content.
And since this was such an obvious and trivial code path, I
didn't even bother to add a test.
Except it _does_ do one non-trivial thing, which is call the
report() function, which wants us to pass a pointer to a
"struct object". Which we don't have (we have only a "struct
object_id"). So we erroneously passed the NULL object, which
ends up segfaulting.
It seems like we could refactor report() to just take the
object_id itself. But we pass the object pointer along to
a callback function, and indeed this ends up in
builtin/fsck.c's objreport() which does want to look at
other parts of the object (like the type).
So instead, let's just use lookup_unknown_object() to get
the real "struct object", and pass that.
Signed-off-by: Jeff King <peff@peff.net>
---
The problem is in v2.17.1, and of course the v2.18 release candidates.
fsck.c | 3 ++-
t/t7415-submodule-names.sh | 18 ++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/fsck.c b/fsck.c
index bcae2c30e6..48e7e36869 100644
--- a/fsck.c
+++ b/fsck.c
@@ -1036,7 +1036,8 @@ int fsck_finish(struct fsck_options *options)
blob = lookup_blob(oid);
if (!blob) {
- ret |= report(options, &blob->object,
+ struct object *obj = lookup_unknown_object(oid->hash);
+ ret |= report(options, obj,
FSCK_MSG_GITMODULES_BLOB,
"non-blob found at .gitmodules");
continue;
diff --git a/t/t7415-submodule-names.sh b/t/t7415-submodule-names.sh
index a770d92a55..63c767bf99 100755
--- a/t/t7415-submodule-names.sh
+++ b/t/t7415-submodule-names.sh
@@ -151,4 +151,22 @@ test_expect_success 'fsck detects symlinked .gitmodules file' '
)
'
+test_expect_success 'fsck detects non-blob .gitmodules' '
+ git init non-blob &&
+ (
+ cd non-blob &&
+
+ # As above, make the funny directly to avoid index restrictions.
+ mkdir subdir &&
+ cp ../.gitmodules subdir/file &&
+ git add subdir/file &&
+ git commit -m ok &&
+ tree=$(git ls-tree HEAD | sed s/subdir/.gitmodules/ | git mktree) &&
+ commit=$(git commit-tree $tree) &&
+
+ test_must_fail git fsck 2>output &&
+ grep gitmodulesBlob output
+ )
+'
+
test_done
--
2.18.0.rc1.446.g4486251e51
next reply other threads:[~2018-06-09 8:32 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-09 8:32 Jeff King [this message]
2018-06-09 8:38 ` [PATCH] fsck: avoid looking at NULL blob->object Eric Sunshine
2018-06-09 9:19 ` Jeff King
2018-06-09 8:45 ` Duy Nguyen
2018-06-09 9:20 ` Jeff King
2018-06-09 8:50 ` Martin Ågren
2018-06-09 9:21 ` Jeff King
2018-06-09 13:44 ` Martin Ågren
2018-06-12 9:51 ` Jeff King
2018-06-09 9:30 ` [PATCH v2 0/2] .gitmodules fsck cleanups Jeff King
2018-06-09 9:31 ` [PATCH v2 1/2] t7415: don't bother creating commit for symlink test Jeff King
2018-06-09 9:46 ` SZEDER Gábor
2018-06-11 8:35 ` [PATCH v3 0/2] .gitmodules fsck cleanups Jeff King
2018-06-11 8:35 ` [PATCH v3 1/2] t7415: don't bother creating commit for symlink test Jeff King
2018-06-11 8:35 ` [PATCH v3 2/2] fsck: avoid looking at NULL blob->object Jeff King
2018-06-09 9:31 ` [PATCH v2 " Jeff King
2018-06-09 9:50 ` SZEDER Gábor
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=20180609083159.GA6158@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
/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).