Here is an updated patch with a test.
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 occurs because in the function parse_submodule_config_option, the
variable 'value' is assumed to be null, and when passed as an argument
to xstrdup a segmentation fault occurs if it is indeed null.
This is the case when using the .gitmodules example above.
This patch addresses the issue by checking to make sure 'value' is not
null before using it as an argument to xstrdup. For some configuration
options, such as fetchRecurseSubmodules, an empty value is valid. If
the option being read is 'path', an empty value is not valid, and so
an error message is printed.
Signed-off-by: Jharrod LaFon <jlafon <at> eyesopen.com>
---
submodule.c | 6 ++++++
t/t1307-null-submodule-path.sh | 16 ++++++++++++++++
2 files changed, 22 insertions(+)
create mode 100644 t/t1307-null-submodule-path.sh
diff --git a/submodule.c b/submodule.c
index 1821a5b..1e4acfd 100644
--- a/submodule.c
+++ b/submodule.c
@@ -134,6 +134,9 @@ int parse_submodule_config_option(const char *var, const
char *value)
return 0;
if (!strcmp(key, "path")) {
+ if (!value)
+ return config_error_nonbool(var);
+
config = unsorted_string_list_lookup(&config_name_for_path,
value);
if (config)
free(config->util);
@@ -151,6 +154,9 @@ int parse_submodule_config_option(const char *var, const
char *value)
} else if (!strcmp(key, "ignore")) {
char *name_cstr;
+ if (!value)
+ return config_error_nonbool(var);
+
if (strcmp(value, "untracked") && strcmp(value, "dirty") &&
strcmp(value, "all") && strcmp(value, "none")) {
warning("Invalid parameter \"%s\" for config option
\"submodule.%s.ignore\"", value, var);
diff --git a/t/t1307-null-submodule-path.sh b/t/t1307-null-submodule-path.sh
new file mode 100644
index 0000000..eeda2cb
--- /dev/null
+++ b/t/t1307-null-submodule-path.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+test_description='test empty submodule path'
+. ./test-lib.sh
+
+setup() {
+ (printf "[submodule \"test\"]\n" &&
+ printf " path\n" &&
+ printf " url") >.gitmodules
+}
+
+test_expect_success 'git status with empty submodule path should not segfault'
'
+ setup &&
+ test_must_fail git status
+'
+test_done
--
1.7.9.5
--
Jharrod LaFon
OpenEye Scientific Software
On Aug 16, 2013, at 9:12 AM, Jharrod LaFon <jla...@eyesopen.com> wrote:
> OK, I'll incorporate Jeff's changes, add a test and resubmit the patch.
>
> Thanks,
>
> --
> Jharrod LaFon
> OpenEye Scientific Software
>
> On Aug 16, 2013, at 7:14 AM, Jeff King <p...@peff.net> wrote:
>
>> On Fri, Aug 16, 2013 at 09:09:58AM -0400, Jeff King wrote:
>>
>>>>> - if (parse_config_key(var, "submodule", &name, &namelen, &key) < 0 ||
>>>>> !name)
>>>>> + if (parse_config_key(var, "submodule", &name, &namelen, &key) < 0 ||
>>>>> !name || !value)
>>>>> return 0;
>>>
>>> I think this is also the wrong place to make the check, anyway. It is
>>> saying that all values of submodule.X.Y must be non-NULL. But that is
>>> not true. The submodule.X.fetchRecurseSubmodules option can be a
>>> boolean, and:
>>>
>>> [submodule "foo"]
>>> fetchRecurseSubmodules
>>>
>>> is perfectly valid (and is broken by this patch).
>>
>> IOW, I think this is the right fix:
>>
>> diff --git a/submodule.c b/submodule.c
>> index 3f0a3f9..c0f93c2 100644
>> --- a/submodule.c
>> +++ b/submodule.c
>> @@ -134,6 +134,9 @@ int parse_submodule_config_option(const char *var, const
>> char *value)
>> return 0;
>>
>> if (!strcmp(key, "path")) {
>> + if (!value)
>> + return config_error_nonbool(var);
>> +
>> config = unsorted_string_list_lookup(&config_name_for_path,
>> value);
>> if (config)
>> free(config->util);
>> @@ -151,6 +154,9 @@ int parse_submodule_config_option(const char *var, const
>> char *value)
>> } else if (!strcmp(key, "ignore")) {
>> char *name_cstr;
>>
>> + if (!value)
>> + return config_error_nonbool(var);
>> +
>> if (strcmp(value, "untracked") && strcmp(value, "dirty") &&
>> strcmp(value, "all") && strcmp(value, "none")) {
>> warning("Invalid parameter \"%s\" for config option
>> \"submodule.%s.ignore\"", value, var);
>>
>> And new options, as they are added, must decide whether they are boolean
>> or not (and check !value as appropriate).
>>
>> -Peff
>
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
