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 /ll-merge.c | |
| parent | 74b67638166ca2e66497ede559dbf393e7af8b40 (diff) | |
| parent | 18b58f707fdb3ad7d3d4931bd40693834c9ec8a0 (diff) | |
| download | git-6343e2f6f271cf344ea8e7384342502faecaf37c.tar.gz | |
Sync with 2.3.10
Diffstat (limited to 'll-merge.c')
| -rw-r--r-- | ll-merge.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ll-merge.c b/ll-merge.c index 8ea03e536a..4e789f5330 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -88,7 +88,10 @@ static int ll_xdl_merge(const struct ll_merge_driver *drv_unused, xmparam_t xmp; assert(opts); - if (buffer_is_binary(orig->ptr, orig->size) || + if (orig->size > MAX_XDIFF_SIZE || + src1->size > MAX_XDIFF_SIZE || + src2->size > MAX_XDIFF_SIZE || + buffer_is_binary(orig->ptr, orig->size) || buffer_is_binary(src1->ptr, src1->size) || buffer_is_binary(src2->ptr, src2->size)) { return ll_binary_merge(drv_unused, result, |