X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=buffer_tree.c;h=dfecf10a24906f2e165ed9368f69c23e99f6e291;hp=8aa66b6c7efce8a51e37ab2b52f4102f074d936d;hb=e3acf84bf26f2730575624b1a1d3979d84272427;hpb=e2c65e016f5fb330e0360a6fcea60b6ded845460;ds=sidebyside

diff --git a/buffer_tree.c b/buffer_tree.c
index 8aa66b6c..dfecf10a 100644
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -622,11 +622,16 @@ next:
 		if (sz1 + sz2 >= dest_size)
 			break;
 	}
+	/*
+	 * If the second buffer is large, we only take the first part of it to
+	 * avoid having to memcpy() huge buffers.
+	 */
+	sz2 = PARA_MIN(sz2, (size_t)(64 * 1024));
 	if (!wbr) {
 		assert(buf1);
 		if (!buf2) /* nothing to do */
 			return;
-		/* make a new wrap buffer combining buf1 and buf 2. */
+		/* Make a new wrap buffer combining buf1 and buf2. */
 		sz = sz1 + sz2;
 		buf = para_malloc(sz);
 		PARA_DEBUG_LOG("merging input buffers: (%p:%zu, %p:%zu) -> %p:%zu\n",