Re: [BUG] Segmentation fault in git v2.41.0.rc1
From: Taylor Blau <hidden>
Date: 2023-05-24 14:47:25
Subsystem:
the rest · Maintainer:
Linus Torvalds
Hi Tribo, On Wed, May 24, 2023 at 06:59:55AM +0000, Tribo Dar wrote:
Running `git submodule update` after commenting out the url setting in both .gitmodules and the corresponding section for the submodule in .git/config results in a segmentation fault instead of a suitable error message.
Thanks for reporting. I was able to bisect this with the following bisection script:
--- >8 ---#!/bin/sh
rm -fr clone
if ! test -d repo
then
git init repo
(
cd repo
git submodule add git@github.com:ttaylorr/dotfiles.git
git add --all .
git commit -m "initial commit"
)
fi
git.compile clone repo clone
(
cd clone
git submodule init
sed -ie 's/\turl = git@/#\0/g' .gitmodules .git/config
git.compile submodule update
test $? -gt 128 && exit 1
exit 0
)--- 8< ---
which points to e0a862fdaf (submodule helper: convert relative URL to absolute URL if needed, 2018-10-16) as the culprit. The fix appears to be something like:
--- 8< ---
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 6bf8d666ce..98ee7697f3 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c@@ -2024,8 +2024,9 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce, strbuf_reset(&sb); strbuf_addf(&sb, "submodule.%s.url", sub->name); if (repo_config_get_string_tmp(the_repository, sb.buf, &url)) { - if (starts_with_dot_slash(sub->url) || - starts_with_dot_dot_slash(sub->url)) { + if (sub && sub->url && + (starts_with_dot_slash(sub->url) || + starts_with_dot_dot_slash(sub->url))) { url = resolve_relative_url(sub->url, NULL, 0); need_free_url = 1; } else
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index eae6a46ef3..c97c543dd8 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh@@ -1351,6 +1351,22 @@ test_expect_success 'clone active submodule without submodule url set' ' ) ' +test_expect_success 'update submodules without url set in .gitconfig' ' + test_when_finished "rm -rf multisuper_clone" && + git clone file://"$pwd"/multisuper multisuper_clone && + + git -C multisuper_clone submodule init && + for s in sub0 sub1 sub2 sub3 + do + key=submodule.$s.url && + git -C multisuper_clone config --local --unset $key && + git -C multisuper_clone config --file .gitmodules --unset $key || return 1 + done && + + test_must_fail git -C multisuper_clone submodule update 2>err && + grep "option .url. requires a value" err +' + test_expect_success 'clone --recurse-submodules with a pathspec works' ' test_when_finished "rm -rf multisuper_clone" && cat >expected <<-\EOF && --- >8 ---
I'll clean it up and submit it as a patch shortly. Thanks, Taylor