diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-04-17 21:20:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-17 21:20:58 -0700 |
| commit | f7446fc6bbe9c25f7064ba76b2db4dd67691f7d0 (patch) | |
| tree | 68e605b2bd790aedf5366ee7b93697e5cdc0238d | |
| parent | git-apply: fix option description (diff) | |
| parent | Merge branch 'maint-1.6.0' into maint-1.6.1 (diff) | |
| download | tgif-f7446fc6bbe9c25f7064ba76b2db4dd67691f7d0.tar.xz | |
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1:
Fix buffer overflow in config parser
| -rw-r--r-- | config.c | 2 | ||||
| -rwxr-xr-x | t/t1303-wacky-config.sh | 9 |
2 files changed, 9 insertions, 2 deletions
@@ -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 1983076c75..080117c6bc 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 |