Sync with 2.3.10

2015-09-28 15:28:26 -07:00
parent 74b6763816 18b58f707f
commit 6343e2f6f2
27 changed files with 446 additions and 28 deletions
--- a/builtin/merge-file.c
+++ b/builtin/merge-file.c
@ -75,7 +75,8 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
 			names[i] = argv[i];
 		if (read_mmfile(mmfs + i, fname))
 			return -1;
-		if (buffer_is_binary(mmfs[i].ptr, mmfs[i].size))
+		if (mmfs[i].size > MAX_XDIFF_SIZE ||
+		    buffer_is_binary(mmfs[i].ptr, mmfs[i].size))
 			return error("Cannot merge binary files: %s",
 					argv[i]);
 	}