diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-12-20 10:14:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-12-20 10:14:54 -0800 |
| commit | 2b9cbc6d01ba3e54de09efde1dd2ed46c2d36e94 (patch) | |
| tree | 6ccb23924e2b2d806b3d67cf3796d3d7ad4695a2 /trace2/tr2_sysenv.c | |
| parent | 67dfb897b3ea438a5a7bb29af2cd0360235e5191 (diff) | |
| parent | d49cb162fa752d62cf20548ae057471d348e42ae (diff) | |
| download | git-2b9cbc6d01ba3e54de09efde1dd2ed46c2d36e94.tar.xz | |
Merge branch 'jk/implicit-true'
Some codepaths did not correctly parse configuration variables
specified with valueless "true", which has been corrected.
* jk/implicit-true:
fsck: handle NULL value when parsing message config
trailer: handle NULL value when parsing trailer-specific config
submodule: handle NULL value when parsing submodule.*.branch
help: handle NULL value for alias.* config
trace2: handle NULL values in tr2_sysenv config callback
setup: handle NULL value when parsing extensions
config: handle NULL value when parsing non-bools
Diffstat (limited to 'trace2/tr2_sysenv.c')
| -rw-r--r-- | trace2/tr2_sysenv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/trace2/tr2_sysenv.c b/trace2/tr2_sysenv.c index d3ecac2772..048cdd5438 100644 --- a/trace2/tr2_sysenv.c +++ b/trace2/tr2_sysenv.c @@ -68,6 +68,8 @@ static int tr2_sysenv_cb(const char *key, const char *value, for (k = 0; k < ARRAY_SIZE(tr2_sysenv_settings); k++) { if (!strcmp(key, tr2_sysenv_settings[k].git_config_name)) { + if (!value) + return config_error_nonbool(key); free(tr2_sysenv_settings[k].value); tr2_sysenv_settings[k].value = xstrdup(value); return 0; |