From: Jeff King <peff@peff.net>
To: Claire Fousse <claire.fousse@ensimag.imag.fr>
Cc: git@vger.kernel.org, Sylvain Boulme <Sylvain.Boulme@imag.fr>,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 04/10] config: avoid segfault when parsing command-line config
Date: Thu, 9 Jun 2011 11:52:43 -0400 [thread overview]
Message-ID: <20110609155243.GD25507@sigill.intra.peff.net> (raw)
In-Reply-To: <20110609155001.GA14969@sigill.intra.peff.net>
We already check for an empty key on the left side of an
equals, but we would segfault if there was no content at
all.
Signed-off-by: Jeff King <peff@peff.net>
---
config.c | 2 ++
t/t1300-repo-config.sh | 4 ++++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/config.c b/config.c
index ebd404a..2517b62 100644
--- a/config.c
+++ b/config.c
@@ -46,6 +46,8 @@ static int git_config_parse_parameter(const char *text,
struct strbuf **pair;
strbuf_addstr(&tmp, text);
pair = strbuf_split_max(&tmp, '=', 2);
+ if (!pair[0])
+ return error("bogus config parameter: %s", text);
if (pair[0]->len && pair[0]->buf[pair[0]->len - 1] == '=')
strbuf_setlen(pair[0], pair[0]->len - 1);
strbuf_trim(pair[0]);
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 584e956..3e140c1 100755
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -918,4 +918,8 @@ test_expect_success 'git -c complains about empty key' '
test_must_fail git -c "=foo" rev-parse
'
+test_expect_success 'git -c complains about empty key and value' '
+ test_must_fail git -c "" rev-parse
+'
+
test_done
--
1.7.6.rc1.36.g91167
next prev parent reply other threads:[~2011-06-09 15:52 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-08 11:19 Git-Mediawiki : cloning a set of pages Claire Fousse
2011-06-08 15:19 ` Jeff King
2011-06-08 17:04 ` Sverre Rabbelier
2011-06-08 17:13 ` Jeff King
2011-06-09 15:50 ` Jeff King
2011-06-09 15:51 ` [PATCH 01/10] strbuf_split: add a max parameter Jeff King
2011-06-13 17:30 ` Junio C Hamano
2011-06-13 19:20 ` Jeff King
2011-06-09 15:51 ` [PATCH 02/10] fix "git -c" parsing of values with equals signs Jeff King
2011-06-09 15:52 ` [PATCH 03/10] config: die on error in command-line config Jeff King
2011-06-09 15:52 ` Jeff King [this message]
2011-06-13 17:30 ` [PATCH 04/10] config: avoid segfault when parsing " Junio C Hamano
2011-06-13 19:22 ` Jeff King
2011-06-09 15:54 ` [PATCH 05/10] strbuf: allow strbuf_split to work on non-strbufs Jeff King
2011-06-09 15:55 ` [PATCH 06/10] config: use strbuf_split_str instead of a temporary strbuf Jeff King
2011-06-09 15:55 ` [PATCH 07/10] parse-options: add OPT_STRING_LIST helper Jeff King
2011-06-09 15:55 ` [PATCH 08/10] remote: use new OPT_STRING_LIST Jeff King
2011-06-09 15:56 ` [PATCH 09/10] config: make git_config_parse_parameter a public function Jeff King
2011-06-09 15:57 ` [PATCH 10/10] clone: accept config options on the command line Jeff King
2011-06-09 17:10 ` Bert Wesarg
2011-06-09 17:12 ` Jeff King
2011-06-09 20:56 ` Jeff King
2011-06-09 22:34 ` Matthieu Moy
2011-06-08 17:14 ` Git-Mediawiki : cloning a set of pages Jakub Narebski
2011-06-09 9:06 ` Claire Fousse
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=20110609155243.GD25507@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=Sylvain.Boulme@imag.fr \
--cc=claire.fousse@ensimag.imag.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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;
as well as URLs for NNTP newsgroup(s).