Commit bc63e1ef521ab5900dc0b0dcd578b8bf18627fb1
2018-09-03T10:49:46
config_parse: refactor error handling when parsing multiline variables The current error handling for the multiline variable parser is a bit fragile, as each error condition has its own code to clear memory. Instead, unify error handling as far as possible to avoid this repetitive code. While at it, make use of `GITERR_CHECK_ALLOC` to correctly handle OOM situations and verify that the buffer we print into does not run out of memory either.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76
diff --git a/src/config_parse.c b/src/config_parse.c
index bc70eec..282aabe 100644
--- a/src/config_parse.c
+++ b/src/config_parse.c
@@ -315,46 +315,52 @@ done:
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') {
- git__free(line);
- 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;
}