Re: Null pointer dereference in git-submodule
- From
René Scharfe <l.s.r@web.de>
- Date
- Mar 25, 2018, 10:57 UTC
- Message-ID
- <9c3c0161-f894-3368-ece2-500d0bb6f475@web.de>
- In-Reply-To
- <20180325095046.GA687@feusi.co>
Am 25.03.2018 um 11:50 schrieb Jeremy Feusi:
Show 11 quoted lines
> > Hmm... That's weird. I can reproduce it on 3 independant systems with > versions 2.16.2 up, although it does not work with version 2.11.0. > Anyway, I figured out how to reproduce this bug. It is caused when a > submodule is added and then the directory it resides in is moved or > deleted without commiting. For example: > > git init > git submodule add https://github.com/git/git git > mv git git.BAK > git submodule status #this command segfaults
With the patch I sent in my first reply the last command reports:
fatal: no ref store in submodule 'git'
That may not be the most helpful message -- not just the ref store is missing, the whole submodule is gone!
Come to think about it, this removal may be intended. How about showing the submodule as not being initialized at that point?
-- >8 -- Subject: [PATCH v2] submodule: check for NULL return of get_submodule_ref_store()
If we can't find a ref store for a submodule then assume it the latter is not initialized (or was removed). Print a status line accordingly instead of causing a segmentation fault by passing NULL as the first parameter of refs_head_ref().
Reported-by: Jeremy Feusi <jeremy@feusi.co> Signed-off-by: Rene Scharfe <l.s.r@web.de> --- Test missing..
builtin/submodule--helper.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index ee020d4749..ae3014ac5a 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -654,9 +654,13 @@ static void status_submodule(const char *path, const struct object_id *ce_oid, displaypath); } else if (!(flags & OPT_CACHED)) { struct object_id oid; + struct ref_store *refs = get_submodule_ref_store(path); - if (refs_head_ref(get_submodule_ref_store(path), - handle_submodule_head_ref, &oid)) + if (!refs) { + print_status(flags, '-', path, ce_oid, displaypath); + goto cleanup; + } + if (refs_head_ref(refs, handle_submodule_head_ref, &oid)) die(_("could not resolve HEAD ref inside the " "submodule '%s'"), path);
-- 2.17.0.rc1.38.g7c51fd80b8