diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-09-28 15:28:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-28 15:28:31 -0700 |
| commit | 6343e2f6f271cf344ea8e7384342502faecaf37c (patch) | |
| tree | 50abed20e4b930022a24b64389915f7c774acef9 /builtin/merge-file.c | |
| parent | Git 2.4.9 (diff) | |
| parent | Git 2.3.10 (diff) | |
| download | tgif-6343e2f6f271cf344ea8e7384342502faecaf37c.tar.xz | |
Sync with 2.3.10
Diffstat (limited to 'builtin/merge-file.c')
| -rw-r--r-- | builtin/merge-file.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/merge-file.c b/builtin/merge-file.c index ea8093f676..50d0bc873b 100644 --- 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]); } |