From: Andre Noll <maan@systemlinux.org>
Date: Thu, 13 May 2010 18:13:02 +0000 (+0200)
Subject: Merge remote branch 'fml/master'
X-Git-Tag: v0.4.3~23
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=840725e10602abd8187428924040f4bf3e04594c;hp=1f36df1d82e5e143c4ebaafeb66362145ea3c18f

Merge remote branch 'fml/master'
---

diff --git a/crypt.c b/crypt.c
index b977a07a..b6a54604 100644
--- a/crypt.c
+++ b/crypt.c
@@ -220,7 +220,7 @@ int rc4_send_bin_buffer(struct rc4_context *rc4c, const char *buf, size_t len)
 	unsigned char *tmp;
 
 	assert(len);
-	tmp = para_malloc(len);
+	tmp = para_malloc(len + 8);
 	RC4(&rc4c->send_key, len, (const unsigned char *)buf, tmp);
 	ret = write_all(rc4c->fd, (char *)tmp, &len);
 	free(tmp);