diff options
| author | Jeff King <peff@peff.net> | 2023-12-07 07:11:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-12-08 23:24:39 (GMT) |
| commit | ba176db511b3438738a4aeb98e574310e697ff5f (patch) | |
| tree | 647a878be2c8d0f0d48a8f74f9f9fcfc051fecd1 /builtin/pack-objects.c | |
| parent | 564d0252ca632e0264ed670534a51d18a689ef5d (diff) | |
| download | git-ba176db511b3438738a4aeb98e574310e697ff5f.zip git-ba176db511b3438738a4aeb98e574310e697ff5f.tar.gz git-ba176db511b3438738a4aeb98e574310e697ff5f.tar.bz2 | |
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/pack-objects.c')
| -rw-r--r-- | builtin/pack-objects.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 89a8b5a..62c540b 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -3204,7 +3204,7 @@ static int git_pack_config(const char *k, const char *v, return 0; } if (!strcmp(k, "uploadpack.blobpackfileuri")) { - struct configured_exclusion *ex = xmalloc(sizeof(*ex)); + struct configured_exclusion *ex; const char *oid_end, *pack_end; /* * Stores the pack hash. This is not a true object ID, but is @@ -3212,6 +3212,10 @@ static int git_pack_config(const char *k, const char *v, */ struct object_id pack_hash; + if (!v) + return config_error_nonbool(k); + + ex = xmalloc(sizeof(*ex)); if (parse_oid_hex(v, &ex->e.oid, &oid_end) || *oid_end != ' ' || parse_oid_hex(oid_end + 1, &pack_hash, &pack_end) || |