diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-03-03 15:15:03 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-03-03 15:15:03 +0900 |
| commit | 614a0a207999f413206bf547e3c603ac015554b0 (patch) | |
| tree | 3fd19c10cd668b7e8d10a2ba3acf3ee42d5078ab /builtin/merge-file.c | |
| parent | c4b6a289fe358abffd0b1ce1897b9fcc08a74271 (diff) | |
| download | git-614a0a207999f413206bf547e3c603ac015554b0.tar.gz git-614a0a207999f413206bf547e3c603ac015554b0.tar.bz2 git-614a0a207999f413206bf547e3c603ac015554b0.zip | |
Imported Upstream version 2.3.10upstream/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 232b7685..04ae36a4 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]); } |