proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-05 04:59:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Config subsection name should allow to have ']' and '\\' should allow to escape any characters

Browse Source
This commit is contained in:
Linquize 2013-09-30 23:38:22 +08:00
parent e6a1d9a248
commit 566dd8cec0
1 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/config_file.c
View File

@ -712,7 +712,6 @@ static int parse_section_header_ext(struct reader *reader, const char *line, con
int c, rpos; int c, rpos;
char *first_quote, *last_quote; char *first_quote, *last_quote;
git_buf buf = GIT_BUF_INIT; git_buf buf = GIT_BUF_INIT;
int quote_marks;
/* /*
* base_name is what came before the space. We should be at the * base_name is what came before the space. We should be at the
* first quotation mark, except for now, line isn't being kept in * first quotation mark, except for now, line isn't being kept in
@ -731,21 +730,15 @@ static int parse_section_header_ext(struct reader *reader, const char *line, con
git_buf_printf(&buf, "%s.", base_name); git_buf_printf(&buf, "%s.", base_name);
rpos = 0; rpos = 0;
quote_marks = 0;
line = first_quote; line = first_quote;
c = line[rpos++]; c = line[++rpos];
/* /*
* At the end of each iteration, whatever is stored in c will be * At the end of each iteration, whatever is stored in c will be
* added to the string. In case of error, jump to out * added to the string. In case of error, jump to out
*/ */
do { do {
if (quote_marks == 2) {
set_parse_error(reader, rpos, "Unexpected text after closing quotes");
git_buf_free(&buf);
return -1;
}
switch (c) { switch (c) {
case 0: case 0:
@ -754,25 +747,13 @@ static int parse_section_header_ext(struct reader *reader, const char *line, con
return -1; return -1;
case '"': case '"':
++quote_marks; goto end_parse;
continue;
case '\\': case '\\':
c = line[rpos++]; c = line[++rpos];
switch (c) { if (c == 0) {
case '"': set_parse_error(reader, rpos, "Unexpected end-of-line in section header");
if (&line[rpos-1] == last_quote) {
set_parse_error(reader, 0, "Missing closing quotation mark in section header");
git_buf_free(&buf);
return -1;
}
case '\\':
break;
default:
set_parse_error(reader, rpos, "Unsupported escape sequence");
git_buf_free(&buf); git_buf_free(&buf);
return -1; return -1;
} }
@ -782,7 +763,15 @@ static int parse_section_header_ext(struct reader *reader, const char *line, con
} }
git_buf_putc(&buf, (char)c); git_buf_putc(&buf, (char)c);
} while ((c = line[rpos++]) != ']'); c = line[++rpos];
} while (line + rpos < last_quote);
end_parse:
if (line[rpos] != '"' || line[rpos + 1] != ']') {
set_parse_error(reader, rpos, "Unexpected text after closing quotes");
git_buf_free(&buf);
return -1;
}
*section_name = git_buf_detach(&buf); *section_name = git_buf_detach(&buf);
return 0; return 0;
@ -800,7 +789,7 @@ static int parse_section_header(struct reader *reader, char **section_out)
return -1; return -1;
/* find the end of the variable's name */ /* find the end of the variable's name */
name_end = strchr(line, ']'); name_end = strrchr(line, ']');
if (name_end == NULL) { if (name_end == NULL) {
git__free(line); git__free(line);
set_parse_error(reader, 0, "Missing ']' in section header"); set_parse_error(reader, 0, "Missing ']' in section header");