diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-04-27 22:36:43 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-04-27 22:36:43 +0400 |
commit | c5a5f12e5a514d198f49a76d4e001c88570bf7d1 (patch) | |
tree | b66c2a8a2596b27f922fd2b9aa476895037a8780 | |
parent | 2a2dbd2770b4dbda59b5b22e19fac973d08d0864 (diff) | |
parent | e96c19c50fb0807570b85cb5b8aae6dfcfa9b9ec (diff) |
Merge branch 'ef/maint-strbuf-init'
* ef/maint-strbuf-init:
config: support values longer than 1023 bytes
strbuf: make sure buffer is zero-terminated
-rw-r--r-- | config.c | 18 | ||||
-rw-r--r-- | strbuf.c | 4 | ||||
-rwxr-xr-x | t/t1303-wacky-config.sh | 2 |
3 files changed, 12 insertions, 12 deletions
@@ -133,23 +133,21 @@ static int get_next_char(void) static char *parse_value(void) { - static char value[1024]; - int quote = 0, comment = 0, len = 0, space = 0; + static struct strbuf value = STRBUF_INIT; + int quote = 0, comment = 0, space = 0; + strbuf_reset(&value); for (;;) { int c = get_next_char(); - if (len >= sizeof(value) - 1) - return NULL; if (c == '\n') { if (quote) return NULL; - value[len] = 0; - return value; + return value.buf; } if (comment) continue; if (isspace(c) && !quote) { - if (len) + if (value.len) space++; continue; } @@ -160,7 +158,7 @@ static char *parse_value(void) } } for (; space; space--) - value[len++] = ' '; + strbuf_addch(&value, ' '); if (c == '\\') { c = get_next_char(); switch (c) { @@ -182,14 +180,14 @@ static char *parse_value(void) default: return NULL; } - value[len++] = c; + strbuf_addch(&value, c); continue; } if (c == '"') { quote = 1-quote; continue; } - value[len++] = c; + strbuf_addch(&value, c); } } @@ -30,8 +30,10 @@ void strbuf_init(struct strbuf *sb, size_t hint) { sb->alloc = sb->len = 0; sb->buf = strbuf_slopbuf; - if (hint) + if (hint) { strbuf_grow(sb, hint); + sb->buf[0] = '\0'; + } } void strbuf_release(struct strbuf *sb) diff --git a/t/t1303-wacky-config.sh b/t/t1303-wacky-config.sh index 080117c6bc..46103a1591 100755 --- a/t/t1303-wacky-config.sh +++ b/t/t1303-wacky-config.sh @@ -44,7 +44,7 @@ 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" + check section.key "$LONG_VALUE" ' test_done |