diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-09-29 01:33:56 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-29 01:33:56 +0300 |
| commit | 11a458befcd7662fbe6d2d53c76d49ae2b0fe219 (patch) | |
| tree | de4cf6a8a43cb30b53f924ed8820de09409f0afd /ll-merge.c | |
| parent | ee6ad5f4d56e697c972af86cbefdf269b386e470 (diff) | |
| parent | a2558fb8e1e387b630312311e1d22c95663da5d0 (diff) | |
Sync with 2.4.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 fc3c049594..bf83290793 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -89,7 +89,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, |