From: "Thomas Bachem via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Phillip Wood <phillip.wood@dunelm.org.uk>,
Jeff King <peff@peff.net>, Taylor Blau <me@ttaylorr.com>,
Derrick Stolee <stolee@gmail.com>, Patrick Steinhardt <ps@pks.im>,
Colin Hinton <colinlewishinton@gmail.com>,
Matt Hunter <m@lfurio.us>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Usman Akinyemi <usmanakinyemi202@gmail.com>,
Miklos Vajna <vmiklos@collabora.com>,
Junio C Hamano <gitster@pobox.com>,
Thomas Bachem <mail@thomasbachem.com>,
Thomas Bachem <mail@thomasbachem.com>
Subject: [PATCH v3 15/15] config: handle NULL values when listing colors and expiry dates
Date: Wed, 11 Nov 2026 22:49:15 +0000 [thread overview]
Message-ID: <f6f3295ff53a13b4b0093ca00ef9383b0ebf9b21.1794437355.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.2297.v3.git.1794437355.gitgitgadget@gmail.com>
From: Thomas Bachem <mail@thomasbachem.com>
Since 2d4ab5a885 (config: format colors quietly, 2026-02-23) and
9cb4a5e1ba (config: format expiry dates quietly, 2026-02-23),
"git config list --type=color" and "--type=expiry-date" pass every
value to color_parse_quietly() or parse_expiry_date(), which do not
handle NULL. So both segfault when any key in the configuration has
no value.
Skip such a key quietly, as both already do with a value that does
not parse, and as "--type=int" does with a key without a value.
Assisted-by: Claude Opus 5.5
Signed-off-by: Thomas Bachem <mail@thomasbachem.com>
---
builtin/config.c | 4 ++--
t/t1300-config.sh | 10 ++++++++++
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/builtin/config.c b/builtin/config.c
index 2554322317..f786c0b123 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -366,7 +366,7 @@ static int format_config_expiry_date(struct strbuf *buf,
{
timestamp_t t;
if (quietly) {
- if (parse_expiry_date(value_, &t))
+ if (!value_ || parse_expiry_date(value_, &t))
return -1;
} else if (git_config_expiry_date(&t, key_, value_) < 0) {
return -1;
@@ -384,7 +384,7 @@ static int format_config_color(struct strbuf *buf,
char v[COLOR_MAXLEN];
if (gently) {
- if (color_parse_quietly(value_, v) < 0)
+ if (!value_ || color_parse_quietly(value_, v) < 0)
return -1;
} else if (git_config_color(v, key_, value_) < 0) {
return -1;
diff --git a/t/t1300-config.sh b/t/t1300-config.sh
index 8fb920b1ba..3322b0bf4f 100755
--- a/t/t1300-config.sh
+++ b/t/t1300-config.sh
@@ -2648,6 +2648,16 @@ test_expect_success 'list --type=color shows only canonicalizable color values'
test_must_be_empty err
'
+test_expect_success 'list --type=color and --type=expiry-date skip keys without a value' '
+ git -c section.valueless config ${mode_prefix}list --type=color >actual 2>err &&
+ test_grep ! valueless actual &&
+ test_must_be_empty err &&
+
+ git -c section.valueless config ${mode_prefix}list --type=expiry-date >actual 2>err &&
+ test_grep ! valueless actual &&
+ test_must_be_empty err
+'
+
test_expect_success '--type rejects unknown specifiers' '
test_must_fail git config --type=nonsense section.foo 2>error &&
test_grep "unrecognized --type argument" error
--
gitgitgadget
next prev parent reply other threads:[~2026-11-11 22:49 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-07 8:42 [PATCH 00/15] Fix segfaults on settings given without a value Thomas Bachem via GitGitGadget
2026-11-07 8:42 ` [PATCH 01/15] rebase -i: handle NULL value for rebase.missingCommitsCheck Thomas Bachem via GitGitGadget
2026-11-09 15:07 ` Phillip Wood
2026-11-09 19:45 ` Junio C Hamano
2026-11-09 20:03 ` Thomas Bachem
2026-11-07 8:42 ` [PATCH 02/15] odb: handle NULL values for core.alternateRefs* config Thomas Bachem via GitGitGadget
2026-11-07 8:42 ` [PATCH 03/15] add-patch: handle NULL value for color slots Thomas Bachem via GitGitGadget
2026-11-07 8:42 ` [PATCH 04/15] bundle-uri: handle NULL value for fetch.bundleCreationToken Thomas Bachem via GitGitGadget
2026-11-09 13:39 ` Derrick Stolee
2026-11-07 8:42 ` [PATCH 05/15] grep: handle NULL value for grep.patternType Thomas Bachem via GitGitGadget
2026-11-07 8:42 ` [PATCH 06/15] remote: handle NULL value for remote.<name>.tagOpt Thomas Bachem via GitGitGadget
2026-11-10 11:14 ` Phillip Wood
2026-11-07 8:42 ` [PATCH 07/15] blame: handle NULL values for color.blame.* config Thomas Bachem via GitGitGadget
2026-11-10 11:14 ` Phillip Wood
2026-11-07 8:42 ` [PATCH 08/15] merge: handle NULL value for branch.<name>.mergeOptions Thomas Bachem via GitGitGadget
2026-11-10 11:12 ` Phillip Wood
2026-11-10 16:53 ` Junio C Hamano
2026-11-11 14:47 ` Phillip Wood
2026-11-11 15:26 ` Ben Knoble
2026-11-11 17:50 ` Junio C Hamano
2026-11-07 8:42 ` [PATCH 09/15] remote: handle NULL value for remotes.<group> Thomas Bachem via GitGitGadget
2026-11-07 8:42 ` [PATCH 10/15] setup: handle NULL value for safe.bareRepository Thomas Bachem via GitGitGadget
2026-11-07 8:42 ` [PATCH 11/15] pseudo-merge: handle NULL value for bitmapPseudoMerge.<name>.pattern Thomas Bachem via GitGitGadget
2026-11-07 8:42 ` [PATCH 12/15] scalar: handle NULL value for scalar.repo Thomas Bachem via GitGitGadget
2026-11-09 13:32 ` Derrick Stolee
2026-11-07 8:42 ` [PATCH 13/15] config: handle NULL value for remote URLs in hasconfig includes Thomas Bachem via GitGitGadget
2026-11-07 8:42 ` [PATCH 14/15] bundle-uri: handle NULL values in bundle lists Thomas Bachem via GitGitGadget
2026-11-09 13:36 ` Derrick Stolee
2026-11-07 8:42 ` [PATCH 15/15] config: handle NULL values when listing colors and expiry dates Thomas Bachem via GitGitGadget
2026-11-09 13:42 ` [PATCH 00/15] Fix segfaults on settings given without a value Derrick Stolee
2026-11-10 7:36 ` [PATCH v2 " Thomas Bachem via GitGitGadget
2026-11-10 7:36 ` [PATCH v2 01/15] rebase -i: handle NULL value for rebase.missingCommitsCheck Thomas Bachem via GitGitGadget
2026-11-10 11:15 ` Phillip Wood
2026-11-10 7:36 ` [PATCH v2 02/15] odb: handle NULL values for core.alternateRefs* config Thomas Bachem via GitGitGadget
2026-11-10 7:36 ` [PATCH v2 03/15] add-patch: handle NULL value for color slots Thomas Bachem via GitGitGadget
2026-11-10 7:36 ` [PATCH v2 04/15] bundle-uri: handle NULL value for fetch.bundleCreationToken Thomas Bachem via GitGitGadget
2026-11-10 7:36 ` [PATCH v2 05/15] grep: handle NULL value for grep.patternType Thomas Bachem via GitGitGadget
2026-11-10 7:36 ` [PATCH v2 06/15] remote: handle NULL value for remote.<name>.tagOpt Thomas Bachem via GitGitGadget
2026-11-10 7:36 ` [PATCH v2 07/15] blame: handle NULL values for color.blame.* config Thomas Bachem via GitGitGadget
2026-11-10 7:36 ` [PATCH v2 08/15] merge: handle NULL value for branch.<name>.mergeOptions Thomas Bachem via GitGitGadget
2026-11-10 7:36 ` [PATCH v2 09/15] remote: handle NULL value for remotes.<group> Thomas Bachem via GitGitGadget
2026-11-10 7:36 ` [PATCH v2 10/15] setup: handle NULL value for safe.bareRepository Thomas Bachem via GitGitGadget
2026-11-10 7:36 ` [PATCH v2 11/15] pseudo-merge: handle NULL value for bitmapPseudoMerge.<name>.pattern Thomas Bachem via GitGitGadget
2026-11-10 7:36 ` [PATCH v2 12/15] scalar: handle NULL value for scalar.repo Thomas Bachem via GitGitGadget
2026-11-10 7:36 ` [PATCH v2 13/15] config: handle NULL value for remote URLs in hasconfig includes Thomas Bachem via GitGitGadget
2026-11-10 7:36 ` [PATCH v2 14/15] bundle-uri: handle NULL values in bundle lists Thomas Bachem via GitGitGadget
2026-11-10 11:11 ` Phillip Wood
2026-11-10 15:03 ` Derrick Stolee
2026-11-10 7:36 ` [PATCH v2 15/15] config: handle NULL values when listing colors and expiry dates Thomas Bachem via GitGitGadget
2026-11-10 11:17 ` [PATCH v2 00/15] Fix segfaults on settings given without a value Phillip Wood
2026-11-10 20:38 ` Thomas Bachem
2026-11-11 22:49 ` [PATCH v3 " Thomas Bachem via GitGitGadget
2026-11-11 22:49 ` [PATCH v3 01/15] rebase -i: handle NULL value for rebase.missingCommitsCheck Thomas Bachem via GitGitGadget
2026-11-11 22:49 ` [PATCH v3 02/15] odb: handle NULL values for core.alternateRefs* config Thomas Bachem via GitGitGadget
2026-11-11 22:49 ` [PATCH v3 03/15] add-patch: handle NULL value for color slots Thomas Bachem via GitGitGadget
2026-11-11 22:49 ` [PATCH v3 04/15] bundle-uri: handle NULL value for fetch.bundleCreationToken Thomas Bachem via GitGitGadget
2026-11-11 22:49 ` [PATCH v3 05/15] grep: handle NULL value for grep.patternType Thomas Bachem via GitGitGadget
2026-11-11 22:49 ` [PATCH v3 06/15] remote: handle NULL value for remote.<name>.tagOpt Thomas Bachem via GitGitGadget
2026-11-11 22:49 ` [PATCH v3 07/15] blame: handle NULL values for color.blame.* config Thomas Bachem via GitGitGadget
2026-11-11 22:49 ` [PATCH v3 08/15] merge: handle NULL value for branch.<name>.mergeOptions Thomas Bachem via GitGitGadget
2026-11-11 22:49 ` [PATCH v3 09/15] remote: handle NULL value for remotes.<group> Thomas Bachem via GitGitGadget
2026-11-11 22:49 ` [PATCH v3 10/15] setup: handle NULL value for safe.bareRepository Thomas Bachem via GitGitGadget
2026-11-11 22:49 ` [PATCH v3 11/15] pseudo-merge: handle NULL value for bitmapPseudoMerge.<name>.pattern Thomas Bachem via GitGitGadget
2026-11-11 22:49 ` [PATCH v3 12/15] scalar: handle NULL value for scalar.repo Thomas Bachem via GitGitGadget
2026-11-11 22:49 ` [PATCH v3 13/15] config: handle NULL value for remote URLs in hasconfig includes Thomas Bachem via GitGitGadget
2026-11-11 22:49 ` [PATCH v3 14/15] bundle-uri: handle NULL values in bundle lists Thomas Bachem via GitGitGadget
2026-11-11 22:49 ` Thomas Bachem via GitGitGadget [this message]
2026-11-12 14:25 ` [PATCH v3 00/15] Fix segfaults on settings given without a value Phillip Wood
2026-11-12 14:25 ` Derrick Stolee
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f6f3295ff53a13b4b0093ca00ef9383b0ebf9b21.1794437355.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=colinlewishinton@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=m@lfurio.us \
--cc=mail@thomasbachem.com \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
--cc=phillip.wood@dunelm.org.uk \
--cc=ps@pks.im \
--cc=stolee@gmail.com \
--cc=usmanakinyemi202@gmail.com \
--cc=vmiklos@collabora.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox