Merge pull request #4781 from nelhage/multiline-loop

config: convert unbounded recursion into a loop

src/config_parse.c

@@ -317,8 +317,9 @@ static int parse_multiline_variable(git_config_parser *reader, git_buf *value, i
 {
 	char *line = NULL, *proc_line = NULL;
 	int quote_count;
-	bool multiline;
+	bool multiline = true;
 
+	while (multiline) {
 		/* Check that the next line exists */
 		git_parse_advance_line(&reader->ctx);
 		line = git__strndup(reader->ctx.line, reader->ctx.line_len);
@@ -337,9 +338,8 @@ static int parse_multiline_variable(git_config_parser *reader, git_buf *value, i
 
 		/* If it was just a comment, pretend it didn't exist */
 		if (line[0] == '\0') {
-		git__free(line);
-		return parse_multiline_variable(reader, value, quote_count);
-		/* TODO: unbounded recursion. This **could** be exploitable */
+			in_quotes = quote_count;
+			continue;
 		}
 
 		if (unescape_line(&proc_line, &multiline, line, in_quotes) < 0) {
@@ -352,13 +352,8 @@ static int parse_multiline_variable(git_config_parser *reader, git_buf *value, i
 		git__free(line);
 		git__free(proc_line);
 
-	/*
-	 * If we need to continue reading the next line, let's just
-	 * keep putting stuff in the buffer
-	 */
-	if (multiline)
-		return parse_multiline_variable(reader, value, quote_count);
-
+		in_quotes = quote_count;
+	}
 	return 0;
 }