Skip to content

config: Fix a leak parsing multi-line config entries #4792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pks-t merged 2 commits into from
Sep 6, 2018
Merged

config: Fix a leak parsing multi-line config entries #4792

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38b8525
config: Fix a leak parsing multi-line config entries
nelhage Sep 1, 2018
bc63e1e
config_parse: refactor error handling when parsing multiline variables
pks-t Sep 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 25 additions & 18 deletions src/config_parse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,45 +315,52 @@ static int unescape_line(

static int parse_multiline_variable(git_config_parser *reader, git_buf *value, int in_quotes)
{
char *line = NULL, *proc_line = NULL;
int quote_count;
bool multiline = true;

while (multiline) {
char *line = NULL, *proc_line = NULL;
int error;

/* Check that the next line exists */
git_parse_advance_line(&reader->ctx);
line = git__strndup(reader->ctx.line, reader->ctx.line_len);
if (line == NULL)
return -1;
GITERR_CHECK_ALLOC(line);

/* We've reached the end of the file, there is no continuation.
/*
* We've reached the end of the file, there is no continuation.
* (this is not an error).
*/
if (line[0] == '\0') {
git__free(line);
return 0;
error = 0;
goto out;
}

/* If it was just a comment, pretend it didn't exist */
quote_count = strip_comments(line, !!in_quotes);
if (line[0] == '\0')
goto next;

/* If it was just a comment, pretend it didn't exist */
if (line[0] == '\0') {
in_quotes = quote_count;
continue;
}
if ((error = unescape_line(&proc_line, &multiline,
line, in_quotes)) < 0)
goto out;

if (unescape_line(&proc_line, &multiline, line, in_quotes) < 0) {
git__free(line);
return -1;
}
/* add this line to the multiline var */
/* Add this line to the multiline var */
if ((error = git_buf_puts(value, proc_line)) < 0)
goto out;

git_buf_puts(value, proc_line);
next:
git__free(line);
git__free(proc_line);

in_quotes = quote_count;
continue;

out:
git__free(line);
git__free(proc_line);
return error;
}

return 0;
}

Expand Down