config: avoid segfault when parsing command-line config

peff · gitster · commit c5d6350bdc8d · 2011-06-22T11:24:51.000-07:00
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 &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -918,4 +918,8 @@ test_expect_success 'git -c complains about empty key' '`
`918`	`918`	`test_must_fail git -c "=foo" rev-parse`
`919`	`919`	`'`
`920`	`920`
	`921`	`+test_expect_success 'git -c complains about empty key and value' '`
	`922`	`+ test_must_fail git -c "" rev-parse`
	`923`	`+'`
	`924`	`+`
`921`	`925`	`test_done`