From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 31 Aug 2016 16:07:44 +0000 (+0100)
Subject: [Fix] Fix actrie patterns
X-Git-Tag: 1.3.5~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02b1473d59e414eddb3808d6e264dce5c4140f00;p=thirdparty%2Frspamd.git

[Fix] Fix actrie patterns
---

diff --git a/src/libutil/multipattern.c b/src/libutil/multipattern.c
index 1fa1a037b7..5f7e48daa9 100644
--- a/src/libutil/multipattern.c
+++ b/src/libutil/multipattern.c
@@ -269,7 +269,7 @@ rspamd_multipattern_escape_tld_acism (const gchar *pattern, gsize len,
 	res = g_malloc (dlen + 1);
 	slen = strlen (prefix);
 	memcpy (res, prefix, slen);
-	memcpy (res + slen, p, dlen - slen);
+	rspamd_strlcpy (res + slen, p, dlen - slen + 1);
 
 	*dst_len = dlen;
 
@@ -309,9 +309,8 @@ rspamd_multipattern_pattern_filter (const gchar *pattern, gsize len,
 		ret = rspamd_multipattern_escape_tld_acism (pattern, len, dst_len);
 	}
 	else {
-		ret = malloc (len);
-		memcpy (ret, pattern, len);
-		*dst_len = len;
+		ret = malloc (len + 1);
+		*dst_len = rspamd_strlcpy (ret, pattern, len + 1);
 	}
 
 	return ret;