config: avoid segfault when parsing command-line config

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/config.c b/config.c
index 2567b546a36b555cdaa08f19d3a8fea31927505e..9939f65d9e9dfbb7b1f40749a1aaf0850e069350 100644 (file)
--- 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 584e956ac5c807a834b8be5fb44e4543cf8172f8..3e140c18f4183c41c76aaab0834f1d23ce7bcd2d 100755 (executable)
--- 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