mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
avoid segfault on submodule.*.path set to an empty "true"
Git fails due to a segmentation fault if a submodule path is empty. Here is an example .gitmodules that will cause a segmentation fault: [submodule "foo-module"] path url = http://host/repo.git $ git status Segmentation fault (core dumped) This is because the parsing of "submodule.*.path" is not prepared to see a value-less "true" and assumes that the value is always non-NULL (parsing of "ignore" has the same problem). Fix it by checking the NULL-ness of value and complain with config_error_nonbool(). Signed-off-by: Jharrod LaFon <jlafon@eyesopen.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
f59bebb78e
commit
4b05440283
2 changed files with 16 additions and 0 deletions
|
@ -134,6 +134,9 @@ int parse_submodule_config_option(const char *var, const char *value)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (!strcmp(key, "path")) {
|
if (!strcmp(key, "path")) {
|
||||||
|
if (!value)
|
||||||
|
return config_error_nonbool(var);
|
||||||
|
|
||||||
config = unsorted_string_list_lookup(&config_name_for_path, value);
|
config = unsorted_string_list_lookup(&config_name_for_path, value);
|
||||||
if (config)
|
if (config)
|
||||||
free(config->util);
|
free(config->util);
|
||||||
|
@ -151,6 +154,9 @@ int parse_submodule_config_option(const char *var, const char *value)
|
||||||
} else if (!strcmp(key, "ignore")) {
|
} else if (!strcmp(key, "ignore")) {
|
||||||
char *name_cstr;
|
char *name_cstr;
|
||||||
|
|
||||||
|
if (!value)
|
||||||
|
return config_error_nonbool(var);
|
||||||
|
|
||||||
if (strcmp(value, "untracked") && strcmp(value, "dirty") &&
|
if (strcmp(value, "untracked") && strcmp(value, "dirty") &&
|
||||||
strcmp(value, "all") && strcmp(value, "none")) {
|
strcmp(value, "all") && strcmp(value, "none")) {
|
||||||
warning("Invalid parameter \"%s\" for config option \"submodule.%s.ignore\"", value, var);
|
warning("Invalid parameter \"%s\" for config option \"submodule.%s.ignore\"", value, var);
|
||||||
|
|
|
@ -18,6 +18,16 @@ test_expect_success 'setup - initial commit' '
|
||||||
git branch initial
|
git branch initial
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success 'configuration parsing' '
|
||||||
|
test_when_finished "rm -f .gitmodules" &&
|
||||||
|
cat >.gitmodules <<-\EOF &&
|
||||||
|
[submodule "s"]
|
||||||
|
path
|
||||||
|
ignore
|
||||||
|
EOF
|
||||||
|
test_must_fail git status
|
||||||
|
'
|
||||||
|
|
||||||
test_expect_success 'setup - repository in init subdirectory' '
|
test_expect_success 'setup - repository in init subdirectory' '
|
||||||
mkdir init &&
|
mkdir init &&
|
||||||
(
|
(
|
||||||
|
|
Loading…
Reference in a new issue