rugged 0.27.5 → 0.27.7

data/vendor/libgit2/src/config_parse.c

@@ -130,15 +130,15 @@ end_parse:
 
 	if (line[rpos] != '"' || line[rpos + 1] != ']') {
 		set_parse_error(reader, rpos, "Unexpected text after closing quotes");
-		git_buf_free(&buf);
+		git_buf_dispose(&buf);
 		return -1;
 	}
 
 	*section_name = git_buf_detach(&buf);
-	return 0;
+	return base_name_len + 1 /* SP */ + 1 /* " */ + rpos + 1 /* " */ + 1 /* ] */;
 
 end_error:
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 
 	return -1;
 }
@@ -205,7 +205,7 @@ static int parse_section_header(git_config_parser *reader, char **section_out)
 	name[name_length] = 0;
 	*section_out = name;
 
-	return 0;
+	return pos;
 
 fail_parse:
 	git__free(line);
@@ -315,51 +315,49 @@ 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);
-		GITERR_CHECK_ALLOC(line);
-
-		/*
-		 * We've reached the end of the file, there is no continuation.
-		 * (this is not an error).
-		 */
-		if (line[0] == '\0') {
-			error = 0;
-			goto out;
-		}
+	bool multiline;
 
-		/* If it was just a comment, pretend it didn't exist */
-		quote_count = strip_comments(line, !!in_quotes);
-		if (line[0] == '\0')
-			goto next;
+	/* 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;
 
-		if ((error = unescape_line(&proc_line, &multiline,
-					   line, in_quotes)) < 0)
-			goto out;
+	/* 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;
+	}
 
-		/* Add this line to the multiline var */
-		if ((error = git_buf_puts(value, proc_line)) < 0)
-			goto out;
+	quote_count = strip_comments(line, !!in_quotes);
 
-next:
+	/* If it was just a comment, pretend it didn't exist */
+	if (line[0] == '\0') {
 		git__free(line);
-		git__free(proc_line);
-		in_quotes = quote_count;
-		continue;
+		return parse_multiline_variable(reader, value, quote_count);
+		/* TODO: unbounded recursion. This **could** be exploitable */
+	}
 
-out:
+	if (unescape_line(&proc_line, &multiline, line, in_quotes) < 0) {
 		git__free(line);
-		git__free(proc_line);
-		return error;
+		return -1;
 	}
+	/* add this line to the multiline var */
+
+	git_buf_puts(value, proc_line);
+	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);
 
 	return 0;
 }
@@ -406,22 +404,21 @@ static int parse_name(
 static int parse_variable(git_config_parser *reader, char **var_name, char **var_value)
 {
 	const char *value_start = NULL;
-	char *line;
-	int quote_count;
+	char *line = NULL, *name = NULL, *value = NULL;
+	int quote_count, error;
 	bool multiline;
 
+	*var_name = NULL;
+	*var_value = NULL;
+
 	git_parse_advance_ws(&reader->ctx);
 	line = git__strndup(reader->ctx.line, reader->ctx.line_len);
-	if (line == NULL)
-		return -1;
+	GITERR_CHECK_ALLOC(line);
 
 	quote_count = strip_comments(line, 0);
 
-	/* If there is no value, boolean true is assumed */
-	*var_value = NULL;
-
-	if (parse_name(var_name, &value_start, reader, line) < 0)
-		goto on_error;
+	if ((error = parse_name(&name, &value_start, reader, line)) < 0)
+		goto out;
 
 	/*
 	 * Now, let's try to parse the value
@@ -430,30 +427,34 @@ static int parse_variable(git_config_parser *reader, char **var_name, char **var
 		while (git__isspace(value_start[0]))
 			value_start++;
 
-		if (unescape_line(var_value, &multiline, value_start, 0) < 0)
-			goto on_error;
+		if ((error = unescape_line(&value, &multiline, value_start, 0)) < 0)
+			goto out;
 
 		if (multiline) {
 			git_buf multi_value = GIT_BUF_INIT;
-			git_buf_attach(&multi_value, *var_value, 0);
+			git_buf_attach(&multi_value, value, 0);
 
 			if (parse_multiline_variable(reader, &multi_value, quote_count) < 0 ||
-				git_buf_oom(&multi_value)) {
-				git_buf_free(&multi_value);
-				goto on_error;
+			    git_buf_oom(&multi_value)) {
+				error = -1;
+				git_buf_dispose(&multi_value);
+				goto out;
 			}
 
-			*var_value = git_buf_detach(&multi_value);
+			value = git_buf_detach(&multi_value);
 		}
 	}
 
-	git__free(line);
-	return 0;
+	*var_name = name;
+	*var_value = value;
+	name = NULL;
+	value = NULL;
 
-on_error:
-	git__free(*var_name);
+out:
+	git__free(name);
+	git__free(value);
 	git__free(line);
-	return -1;
+	return error;
 }
 
 int git_config_parse(
@@ -465,7 +466,7 @@ int git_config_parse(
 	void *data)
 {
 	git_parse_ctx *ctx;
-	char *current_section = NULL, *var_name, *var_value;
+	char *current_section = NULL, *var_name = NULL, *var_value = NULL;
 	int result = 0;
 
 	ctx = &parser->ctx;
@@ -473,10 +474,14 @@ int git_config_parse(
 	skip_bom(ctx);
 
 	for (; ctx->remain_len > 0; git_parse_advance_line(ctx)) {
-		const char *line_start = parser->ctx.line;
-		size_t line_len = parser->ctx.line_len;
+		const char *line_start;
+		size_t line_len;
 		char c;
 
+	restart:
+		line_start = ctx->line;
+		line_len = ctx->line_len;
+
 		/*
 		 * Get either first non-whitespace character or, if that does
 		 * not exist, the first whitespace character. This is required
@@ -491,9 +496,24 @@ int git_config_parse(
 			git__free(current_section);
 			current_section = NULL;
 
-			if ((result = parse_section_header(parser, &current_section)) == 0 && on_section) {
+			result = parse_section_header(parser, &current_section);
+			if (result < 0)
+				break;
+
+			git_parse_advance_chars(ctx, result);
+
+			if (on_section)
 				result = on_section(parser, current_section, line_start, line_len, data);
-			}
+			/*
+			 * After we've parsed the section header we may not be
+			 * done with the line. If there's still data in there,
+			 * run the next loop with the rest of the current line
+			 * instead of moving forward.
+			 */
+
+			if (!git_parse_peek(&c, ctx, GIT_PARSE_PEEK_SKIP_WHITESPACE))
+				goto restart;
+
 			break;
 
 		case '\n': /* comment or whitespace-only */
@@ -510,7 +530,10 @@ int git_config_parse(
 		default: /* assume variable declaration */
 			if ((result = parse_variable(parser, &var_name, &var_value)) == 0 && on_variable) {
 				result = on_variable(parser, current_section, var_name, var_value, line_start, line_len, data);
+				git__free(var_name);
+				git__free(var_value);
 			}
+
 			break;
 		}
 

data/vendor/libgit2/src/config_parse.h

@@ -36,8 +36,8 @@ typedef int (*git_config_parser_section_cb)(
 typedef int (*git_config_parser_variable_cb)(
 	git_config_parser *parser,
 	const char *current_section,
-	char *var_name,
-	char *var_value,
+	const char *var_name,
+	const char *var_value,
 	const char *line,
 	size_t line_len,
 	void *data);

data/vendor/libgit2/src/crlf.c

@@ -71,6 +71,9 @@ static int crlf_input_action(struct crlf_attrs *ca)
 	if (ca->eol == GIT_EOL_LF)
 		return GIT_CRLF_INPUT;
 
+	if (ca->crlf_action == GIT_CRLF_AUTO)
+		return GIT_CRLF_AUTO;
+
 	if (ca->eol == GIT_EOL_CRLF)
 		return GIT_CRLF_CRLF;
 
@@ -200,6 +203,8 @@ static const char *line_ending(struct crlf_attrs *ca)
 		break;
 
 	case GIT_CRLF_AUTO:
+		if (ca->eol == GIT_EOL_CRLF)
+			return "\r\n";
 	case GIT_CRLF_TEXT:
 		break;
 
@@ -253,8 +258,7 @@ static int crlf_apply_to_workdir(
 		ca->crlf_action == GIT_CRLF_GUESS) {
 
 		/* If we have any existing CR or CRLF line endings, do nothing */
-		if (ca->crlf_action == GIT_CRLF_GUESS &&
-			stats.cr > 0 && stats.crlf > 0)
+		if (stats.cr > 0 && stats.crlf > 0)
 			return GIT_PASSTHROUGH;
 
 		/* If we have bare CR characters, do nothing */
@@ -302,7 +306,8 @@ static int crlf_check(
 		return GIT_PASSTHROUGH;
 
 	if (ca.crlf_action == GIT_CRLF_GUESS ||
-		((ca.crlf_action == GIT_CRLF_AUTO || ca.crlf_action == GIT_CRLF_TEXT) &&
+		((ca.crlf_action == GIT_CRLF_AUTO ||
+		ca.crlf_action == GIT_CRLF_TEXT) &&
 		git_filter_source_mode(src) == GIT_FILTER_SMUDGE)) {
 
 		error = git_repository__cvar(
@@ -315,6 +320,7 @@ static int crlf_check(
 			return GIT_PASSTHROUGH;
 
 		if (ca.auto_crlf == GIT_AUTO_CRLF_INPUT &&
+			ca.eol != GIT_EOL_CRLF &&
 			git_filter_source_mode(src) == GIT_FILTER_SMUDGE)
 			return GIT_PASSTHROUGH;
 	}

data/vendor/libgit2/src/diff.c

@@ -439,7 +439,7 @@ static int file_cb(
 		goto out;
 
 out:
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 	return error;
 }
 
@@ -477,7 +477,7 @@ static int line_cb(
 		goto out;
 
 out:
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 	return error;
 }
 

data/vendor/libgit2/src/diff_driver.c

@@ -121,7 +121,7 @@ static int diff_driver_add_patterns(
 
 	if (error && pat != NULL)
 		(void)git_array_pop(drv->fn_patterns); /* release last item */
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 
 	/* We want to ignore bad patterns, so return success regardless */
 	return 0;
@@ -338,7 +338,7 @@ static int git_diff_driver_load(
 
 done:
 	git_config_entry_free(ce);
-	git_buf_free(&name);
+	git_buf_dispose(&name);
 	git_config_free(cfg);
 
 	if (!*out) {
@@ -516,7 +516,7 @@ void git_diff_find_context_init(
 void git_diff_find_context_clear(git_diff_find_context_payload *payload)
 {
 	if (payload) {
-		git_buf_free(&payload->line);
+		git_buf_dispose(&payload->line);
 		payload->driver = NULL;
 	}
 }

data/vendor/libgit2/src/diff_file.c

@@ -280,7 +280,7 @@ static int diff_file_content_load_workdir_symlink_fake(
 	fc->map.data = git_buf_detach(&target);
 	fc->flags |= GIT_DIFF_FLAG__FREE_DATA;
 
-	git_buf_free(&target);
+	git_buf_dispose(&target);
 	return error;
 }
 
@@ -361,7 +361,7 @@ static int diff_file_content_load_workdir_file(
 		error = git_filter_list_apply_to_data(&out, fl, &raw);
 
 		if (out.ptr != raw.ptr)
-			git_buf_free(&raw);
+			git_buf_dispose(&raw);
 
 		if (!error) {
 			fc->map.len  = out.size;
@@ -406,7 +406,7 @@ static int diff_file_content_load_workdir(
 		fc->file->flags |= GIT_DIFF_FLAG_VALID_ID;
 	}
 
-	git_buf_free(&path);
+	git_buf_dispose(&path);
 	return error;
 }
 

data/vendor/libgit2/src/diff_generate.c

@@ -273,7 +273,8 @@ static git_diff_delta *diff_delta__last_for_item(
 		break;
 	case GIT_DELTA_MODIFIED:
 		if (git_oid__cmp(&delta->old_file.id, &item->id) == 0 ||
-			git_oid__cmp(&delta->new_file.id, &item->id) == 0)
+		    (delta->new_file.mode == item->mode &&
+			git_oid__cmp(&delta->new_file.id, &item->id) == 0))
 			return delta;
 		break;
 	default:
@@ -600,7 +601,7 @@ int git_diff__oid_for_entry(
 
 		if (p_stat(full_path.ptr, &st) < 0) {
 			error = git_path_set_error(errno, entry.path, "stat");
-			git_buf_free(&full_path);
+			git_buf_dispose(&full_path);
 			return error;
 		}
 
@@ -663,7 +664,7 @@ int git_diff__oid_for_entry(
 		}
  	}
 
-	git_buf_free(&full_path);
+	git_buf_dispose(&full_path);
 	return error;
 }
 

data/vendor/libgit2/src/diff_print.c

@@ -373,8 +373,8 @@ int diff_delta_format_similarity_header(
 		error = -1;
 
 done:
-	git_buf_free(&old_path);
-	git_buf_free(&new_path);
+	git_buf_dispose(&old_path);
+	git_buf_dispose(&new_path);
 
 	return error;
 }
@@ -446,8 +446,8 @@ int git_diff_delta__format_file_header(
 		error = -1;
 
 done:
-	git_buf_free(&old_path);
-	git_buf_free(&new_path);
+	git_buf_dispose(&old_path);
+	git_buf_dispose(&new_path);
 
 	return error;
 }
@@ -509,8 +509,8 @@ static int diff_print_patch_file_binary_noshow(
 		old_path.ptr, new_path.ptr);
 
 done:
-	git_buf_free(&old_path);
-	git_buf_free(&new_path);
+	git_buf_dispose(&old_path);
+	git_buf_dispose(&new_path);
 
 	return error;
 }
@@ -696,7 +696,7 @@ int git_diff_print(
 			giterr_set_after_callback_function(error, "git_diff_print");
 	}
 
-	git_buf_free(&buf);
+	git_buf_dispose(&buf);
 
 	return error;
 }
@@ -776,7 +776,7 @@ int git_patch_print(
 			giterr_set_after_callback_function(error, "git_patch_print");
 	}
 
-	git_buf_free(&temp);
+	git_buf_dispose(&temp);
 
 	return error;
 }