From: Jeff King <firstname.lastname@example.org> To: Duy Nguyen <email@example.com> Cc: Eric Wong <firstname.lastname@example.org>, Antonio Ospite <email@example.com>, Junio C Hamano <firstname.lastname@example.org>, Git Mailing List <email@example.com> Subject: Re: [PATCH] get_oid: handle NULL repo->index Date: Tue, 14 May 2019 21:46:22 -0400 [thread overview] Message-ID: <20190515014622.GB13255@sigill.intra.peff.net> (raw) In-Reply-To: <CACsJy8AvsyOz2G1zjRjpKYVZ0DLKj02-v=hXJHS0BRHnxoeWAw@mail.gmail.com> On Wed, May 15, 2019 at 08:24:34AM +0700, Duy Nguyen wrote: > On Tue, May 14, 2019 at 8:54 PM Jeff King <firstname.lastname@example.org> wrote: > > diff --git a/sha1-name.c b/sha1-name.c > > index 775a73d8ad..455e9fb1ea 100644 > > --- a/sha1-name.c > > +++ b/sha1-name.c > > @@ -1837,7 +1837,7 @@ static enum get_oid_result get_oid_with_context_1(struct repository *repo, > > if (flags & GET_OID_RECORD_PATH) > > oc->path = xstrdup(cp); > > > > - if (!repo->index->cache) > > + if (!repo->index || !repo->index->cache) > > repo_read_index(repo); > > We could even drop the "if" and call repo_read_index() > unconditionally. If the index is already read, it will be no-op > (forcing a reread has always been discard_index(); read_index();) I think you missed my bit after the "---": Arguably this code should just unconditionally call repo_read_index(), which should be a noop if the index is already loaded. But I wanted to do the minimal fix here, without getting into any subtle differences between what checking index->cache versus index->initialized might mean. Anybody who wants to dig into that is welcome to make a patch on top. :) > Thanks for catching this by the way. I'll need to go through all > the_index conversion to see if I left similar traps like this. Yeah. I could not find any others, but it would not hurt to have a second set of eyes. Also from my earlier message, if you missed it: I also wondered if we should simply allocate an empty index whenever we have a non-toplevel "struct repository", which might be less surprising to other callers. I don't have a strong opinion either way. I did grep around for other callers which might have similar problems, but couldn't find any. -Peff
next prev parent reply other threads:[~2019-05-15 1:46 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-05-11 20:57 new segfault in master (6a6c0f10a70a6eb1) Eric Wong 2019-05-11 22:31 ` Jeff King 2019-05-11 23:02 ` Jeff King 2019-05-12 4:26 ` Duy Nguyen 2019-05-14 13:54 ` [PATCH] get_oid: handle NULL repo->index Jeff King 2019-05-14 23:38 ` Eric Wong 2019-05-15 1:24 ` Duy Nguyen 2019-05-15 1:46 ` Jeff King [this message] 2019-05-15 5:16 ` Junio C Hamano 2019-05-15 9:29 ` Duy Nguyen 2019-05-16 1:43 ` Junio C Hamano 2019-05-19 2:56 ` [PATCH] repository.c: always allocate 'index' at repo init time Nguyễn Thái Ngọc Duy 2019-05-20 13:17 ` Jeff King 2019-05-21 10:34 ` Duy Nguyen 2019-05-21 20:58 ` Jeff King 2019-05-28 16:07 ` Junio C Hamano
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=20190515014622.GB13255@sigill.intra.peff.net \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --subject='Re: [PATCH] get_oid: handle NULL repo->index' \ /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
Code repositories for project(s) associated with this 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).