rugged 1.3.2.3 → 1.4.2

data/vendor/libgit2/src/patch_generate.c

@@ -261,7 +261,7 @@ static int create_binary(
 	const char *b_data,
 	size_t b_datalen)
 {
-	git_buf deflate = GIT_BUF_INIT, delta = GIT_BUF_INIT;
+	git_str deflate = GIT_STR_INIT, delta = GIT_STR_INIT;
 	size_t delta_data_len = 0;
 	int error;
 
@@ -302,18 +302,18 @@ static int create_binary(
 	if (delta.size && delta.size < deflate.size) {
 		*out_type = GIT_DIFF_BINARY_DELTA;
 		*out_datalen = delta.size;
-		*out_data = git_buf_detach(&delta);
+		*out_data = git_str_detach(&delta);
 		*out_inflatedlen = delta_data_len;
 	} else {
 		*out_type = GIT_DIFF_BINARY_LITERAL;
 		*out_datalen = deflate.size;
-		*out_data = git_buf_detach(&deflate);
+		*out_data = git_str_detach(&deflate);
 		*out_inflatedlen = b_datalen;
 	}
 
 done:
-	git_buf_dispose(&deflate);
-	git_buf_dispose(&delta);
+	git_str_dispose(&deflate);
+	git_str_dispose(&delta);
 
 	return error;
 }
@@ -750,18 +750,34 @@ git_diff_driver *git_patch_generated_driver(git_patch_generated *patch)
 	return patch->ofile.driver;
 }
 
-void git_patch_generated_old_data(
-	char **ptr, size_t *len, git_patch_generated *patch)
+int git_patch_generated_old_data(
+	char **ptr, long *len, git_patch_generated *patch)
 {
+	if (patch->ofile.map.len > LONG_MAX ||
+	    patch->ofile.map.len > GIT_XDIFF_MAX_SIZE) {
+		git_error_set(GIT_ERROR_INVALID, "files too large for diff");
+		return -1;
+	}
+
 	*ptr = patch->ofile.map.data;
-	*len = patch->ofile.map.len;
+	*len = (long)patch->ofile.map.len;
+
+	return 0;
 }
 
-void git_patch_generated_new_data(
-	char **ptr, size_t *len, git_patch_generated *patch)
+int git_patch_generated_new_data(
+	char **ptr, long *len, git_patch_generated *patch)
 {
+	if (patch->ofile.map.len > LONG_MAX ||
+	    patch->ofile.map.len > GIT_XDIFF_MAX_SIZE) {
+		git_error_set(GIT_ERROR_INVALID, "files too large for diff");
+		return -1;
+	}
+
 	*ptr = patch->nfile.map.data;
-	*len = patch->nfile.map.len;
+	*len = (long)patch->nfile.map.len;
+
+	return 0;
 }
 
 static int patch_generated_file_cb(

data/vendor/libgit2/src/patch_generate.h

@@ -21,7 +21,7 @@ enum {
 	GIT_PATCH_GENERATED_DIFFABLE = (1 << 3),
 	/* the difference between the two sides has been computed */
 	GIT_PATCH_GENERATED_DIFFED = (1 << 4),
-	GIT_PATCH_GENERATED_FLATTENED = (1 << 5),
+	GIT_PATCH_GENERATED_FLATTENED = (1 << 5)
 };
 
 struct git_patch_generated {
@@ -39,10 +39,10 @@ typedef struct git_patch_generated git_patch_generated;
 
 extern git_diff_driver *git_patch_generated_driver(git_patch_generated *);
 
-extern void git_patch_generated_old_data(
-	char **, size_t *, git_patch_generated *);
-extern void git_patch_generated_new_data(
-	char **, size_t *, git_patch_generated *);
+extern int git_patch_generated_old_data(
+	char **, long *, git_patch_generated *);
+extern int git_patch_generated_new_data(
+	char **, long *, git_patch_generated *);
 extern int git_patch_generated_from_diff(
 	git_patch **, git_diff *, size_t);
 

data/vendor/libgit2/src/patch_parse.c

@@ -10,7 +10,7 @@
 #include "git2/patch.h"
 #include "patch.h"
 #include "diff_parse.h"
-#include "path.h"
+#include "fs_path.h"
 
 typedef struct {
 	git_patch base;
@@ -65,22 +65,22 @@ static size_t header_path_len(git_patch_parse_ctx *ctx)
 	return len;
 }
 
-static int parse_header_path_buf(git_buf *path, git_patch_parse_ctx *ctx, size_t path_len)
+static int parse_header_path_buf(git_str *path, git_patch_parse_ctx *ctx, size_t path_len)
 {
 	int error;
 
-	if ((error = git_buf_put(path, ctx->parse_ctx.line, path_len)) < 0)
+	if ((error = git_str_put(path, ctx->parse_ctx.line, path_len)) < 0)
 		return error;
 
 	git_parse_advance_chars(&ctx->parse_ctx, path_len);
 
-	git_buf_rtrim(path);
+	git_str_rtrim(path);
 
 	if (path->size > 0 && path->ptr[0] == '"' &&
-	    (error = git_buf_unquote(path)) < 0)
+	    (error = git_str_unquote(path)) < 0)
 		return error;
 
-	git_path_squash_slashes(path);
+	git_fs_path_squash_slashes(path);
 
 	if (!path->size)
 		return git_parse_err("patch contains empty path at line %"PRIuZ,
@@ -91,22 +91,22 @@ static int parse_header_path_buf(git_buf *path, git_patch_parse_ctx *ctx, size_t
 
 static int parse_header_path(char **out, git_patch_parse_ctx *ctx)
 {
-	git_buf path = GIT_BUF_INIT;
+	git_str path = GIT_STR_INIT;
 	int error;
 
 	if ((error = parse_header_path_buf(&path, ctx, header_path_len(ctx))) < 0)
 		goto out;
-	*out = git_buf_detach(&path);
+	*out = git_str_detach(&path);
 
 out:
-	git_buf_dispose(&path);
+	git_str_dispose(&path);
 	return error;
 }
 
 static int parse_header_git_oldpath(
 	git_patch_parsed *patch, git_patch_parse_ctx *ctx)
 {
-	git_buf old_path = GIT_BUF_INIT;
+	git_str old_path = GIT_STR_INIT;
 	int error;
 
 	if (patch->old_path) {
@@ -118,17 +118,17 @@ static int parse_header_git_oldpath(
 	if ((error = parse_header_path_buf(&old_path, ctx, ctx->parse_ctx.line_len - 1)) <  0)
 		goto out;
 
-	patch->old_path = git_buf_detach(&old_path);
+	patch->old_path = git_str_detach(&old_path);
 
 out:
-	git_buf_dispose(&old_path);
+	git_str_dispose(&old_path);
 	return error;
 }
 
 static int parse_header_git_newpath(
 	git_patch_parsed *patch, git_patch_parse_ctx *ctx)
 {
-	git_buf new_path = GIT_BUF_INIT;
+	git_str new_path = GIT_STR_INIT;
 	int error;
 
 	if (patch->new_path) {
@@ -139,10 +139,10 @@ static int parse_header_git_newpath(
 
 	if ((error = parse_header_path_buf(&new_path, ctx, ctx->parse_ctx.line_len - 1)) <  0)
 		goto out;
-	patch->new_path = git_buf_detach(&new_path);
+	patch->new_path = git_str_detach(&new_path);
 
 out:
-	git_buf_dispose(&new_path);
+	git_str_dispose(&new_path);
 	return error;
 }
 
@@ -257,7 +257,7 @@ static int parse_header_rename(
 	char **out,
 	git_patch_parse_ctx *ctx)
 {
-	git_buf path = GIT_BUF_INIT;
+	git_str path = GIT_STR_INIT;
 
 	if (parse_header_path_buf(&path, ctx, header_path_len(ctx)) < 0)
 		return -1;
@@ -265,7 +265,7 @@ static int parse_header_rename(
 	/* Note: the `rename from` and `rename to` lines include the literal
 	 * filename.  They do *not* include the prefix.  (Who needs consistency?)
 	 */
-	*out = git_buf_detach(&path);
+	*out = git_str_detach(&path);
 	return 0;
 }
 
@@ -353,7 +353,7 @@ static int parse_header_start(git_patch_parsed *patch, git_patch_parse_ctx *ctx)
 	 * We cannot expect to be able to always parse paths correctly at this
 	 * point. Due to the possibility of unquoted names, whitespaces in
 	 * filenames and custom prefixes we have to allow that, though, and just
-	 * proceeed here. We then hope for the "---" and "+++" lines to fix that
+	 * proceed here. We then hope for the "---" and "+++" lines to fix that
 	 * for us.
 	 */
 	if (!git_parse_ctx_contains(&ctx->parse_ctx, "\n", 1) &&
@@ -382,7 +382,7 @@ typedef enum {
 	STATE_RENAME,
 	STATE_COPY,
 
-	STATE_END,
+	STATE_END
 } parse_header_state;
 
 typedef struct {
@@ -766,7 +766,7 @@ static int parse_patch_binary_side(
 	git_patch_parse_ctx *ctx)
 {
 	git_diff_binary_t type = GIT_DIFF_BINARY_NONE;
-	git_buf base85 = GIT_BUF_INIT, decoded = GIT_BUF_INIT;
+	git_str base85 = GIT_STR_INIT, decoded = GIT_STR_INIT;
 	int64_t len;
 	int error = 0;
 
@@ -815,7 +815,7 @@ static int parse_patch_binary_side(
 			goto done;
 		}
 
-		if ((error = git_buf_decode_base85(
+		if ((error = git_str_decode_base85(
 			&decoded, ctx->parse_ctx.line, encoded_len, decoded_len)) < 0)
 			goto done;
 
@@ -835,11 +835,11 @@ static int parse_patch_binary_side(
 	binary->type = type;
 	binary->inflatedlen = (size_t)len;
 	binary->datalen = decoded.size;
-	binary->data = git_buf_detach(&decoded);
+	binary->data = git_str_detach(&decoded);
 
 done:
-	git_buf_dispose(&base85);
-	git_buf_dispose(&decoded);
+	git_str_dispose(&base85);
+	git_str_dispose(&decoded);
 	return error;
 }