Sync with 2.4.10

[thirdparty/git.git] / ll-merge.c

diff --git a/ll-merge.c b/ll-merge.c
index fc3c0495942e2a8d7c31a087429f894633c603d8..bf83290793059dc42d89db07a12e3bc3c14a48dc 100644 (file)
--- 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,