diff options
| author | René Scharfe <l.s.r@web.de> | 2018-03-28 21:14:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-28 22:27:02 (GMT) |
| commit | 74b6bda32f8350b2dc32f8d66f4046272168184e (patch) | |
| tree | d28392eae5310dd3009e5806ac78b891c49bf485 /builtin | |
| parent | d32eb83c1db7d0a8bb54fe743c6d1dd674d372c5 (diff) | |
| download | git-74b6bda32f8350b2dc32f8d66f4046272168184e.zip git-74b6bda32f8350b2dc32f8d66f4046272168184e.tar.gz git-74b6bda32f8350b2dc32f8d66f4046272168184e.tar.bz2 | |
submodule: check for NULL return of get_submodule_ref_store()
If we can't find a ref store for a submodule then assume 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>
Reviewed-by: Stefan Beller <sbeller@google.com>
Initial-Test-By: Stefan Beller <sbeller@google.com>
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/submodule--helper.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index a5c4a8a..901632a 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -620,9 +620,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); |