mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-20 02:56:12 +02:00
Code

Merge branch 'ef/maint-strbuf-init' 

* ef/maint-strbuf-init:
  config: support values longer than 1023 bytes
  strbuf: make sure buffer is zero-terminated
This commit is contained in:
Junio C Hamano 2011-04-27 11:36:43 -07:00
parent 2a2dbd2770 e96c19c50f
commit c5a5f12e5a
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
config.c
View File

@ -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);
}
}

4
strbuf.c
View File

@ -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)

2
t/t1303-wacky-config.sh
View File

@ -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