diff options
| author | Jeff King <peff@peff.net> | 2023-12-07 02:11:14 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-12-09 08:24:39 +0900 |
| commit | ba176db511b3438738a4aeb98e574310e697ff5f (patch) | |
| tree | 647a878be2c8d0f0d48a8f74f9f9fcfc051fecd1 /builtin/checkout.c | |
| parent | Git 2.43 (diff) | |
| download | git-ba176db511b3438738a4aeb98e574310e697ff5f.tar.gz git-ba176db511b3438738a4aeb98e574310e697ff5f.zip | |
config: handle NULL value when parsing non-bools
When the config parser sees an "implicit" bool like:
[core]
someVariable
it passes NULL to the config callback. Any callback code which expects a
string must check for NULL. This usually happens via helpers like
git_config_string(), etc, but some custom code forgets to do so and will
segfault.
These are all fairly vanilla cases where the solution is just the usual
pattern of:
if (!value)
return config_error_nonbool(var);
though note that in a few cases we have to split initializers like:
int some_var = initializer();
into:
int some_var;
if (!value)
return config_error_nonbool(var);
some_var = initializer();
There are still some broken instances after this patch, which I'll
address on their own in individual patches after this one.
Reported-by: Carlos Andrés Ramírez Cataño <antaigroupltda@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index f02434bc15..d5c784854f 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1202,6 +1202,8 @@ static int git_checkout_config(const char *var, const char *value, struct checkout_opts *opts = cb; if (!strcmp(var, "diff.ignoresubmodules")) { + if (!value) + return config_error_nonbool(var); handle_ignore_submodules_arg(&opts->diff_options, value); return 0; } |
