diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-18 22:59:35 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-18 22:59:35 +0400 |
| commit | dd42145b1e953fe579778c13a3ad34aa59aa95fe (patch) | |
| tree | f2b49717dd2e34e25368a05b135e75d5e77be51f /submodule.c | |
| parent | 6930cd10de930b09639e1dad7ae8d74f9128e404 (diff) | |
| parent | 4b05440283350ec3b01afabe847d9ce5cf4cbdb7 (diff) | |
Merge branch 'jl/some-submodule-config-are-not-boolean' into maint
* jl/some-submodule-config-are-not-boolean:
avoid segfault on submodule.*.path set to an empty "true"
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/submodule.c b/submodule.c index 3f0a3f9419..c0f93c208c 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); |