summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-18 04:06:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-18 04:06:11 (GMT)
commit0fa0514b9172186d018c884da296ac6705c3e07c (patch)
treef9a5ceda42948715bd283727e1b93fa13548163b
parentbc69776aa12c68958e381e8c24e8faa172dde2d8 (diff)
parente0b3cc0dffbc965ffa33155cbdcf8d44716c134c (diff)
downloadgit-0fa0514b9172186d018c884da296ac6705c3e07c.zip
git-0fa0514b9172186d018c884da296ac6705c3e07c.tar.gz
git-0fa0514b9172186d018c884da296ac6705c3e07c.tar.bz2
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0: Fix buffer overflow in config parser
-rw-r--r--config.c2
-rwxr-xr-xt/t1303-wacky-config.sh9
2 files changed, 9 insertions, 2 deletions
diff --git a/config.c b/config.c
index 790405a..37e3c74 100644
--- a/config.c
+++ b/config.c
@@ -51,7 +51,7 @@ static char *parse_value(void)
for (;;) {
int c = get_next_char();
- if (len >= sizeof(value))
+ if (len >= sizeof(value) - 1)
return NULL;
if (c == '\n') {
if (quote)
diff --git a/t/t1303-wacky-config.sh b/t/t1303-wacky-config.sh
index 1983076..080117c 100755
--- a/t/t1303-wacky-config.sh
+++ b/t/t1303-wacky-config.sh
@@ -10,7 +10,7 @@ setup() {
check() {
echo "$2" >expected
- git config --get "$1" >actual
+ git config --get "$1" >actual 2>&1
test_cmp actual expected
}
@@ -40,4 +40,11 @@ test_expect_success 'make sure git config escapes section names properly' '
check "$SECTION" bar
'
+LONG_VALUE=$(printf "x%01021dx a" 7)
+test_expect_success 'do not crash on special long config line' '
+ setup &&
+ git config section.key "$LONG_VALUE" &&
+ check section.key "fatal: bad config file line 2 in .git/config"
+'
+
test_done