From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 8 Mar 2018 17:07:53 +0000 (+0000)
Subject: [Minor] Fix string copy
X-Git-Tag: 1.7.0~35
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7d40adf82d014bc25de73708ac5c528dc8115f90;p=thirdparty%2Frspamd.git

[Minor] Fix string copy
---

diff --git a/src/libmime/content_type.c b/src/libmime/content_type.c
index 946a9b838b..bcb0478981 100644
--- a/src/libmime/content_type.c
+++ b/src/libmime/content_type.c
@@ -502,8 +502,8 @@ rspamd_content_disposition_parse (const gchar *in,
 {
 	struct rspamd_content_disposition *res = NULL, val;
 
-	val.lc_data = rspamd_mempool_alloc (pool, len);
-	memcpy (val.lc_data, in, len);
+	val.lc_data = rspamd_mempool_alloc (pool, len + 1);
+	rspamd_strlcpy (val.lc_data, in, len);
 	rspamd_str_lc (val.lc_data, len);
 
 	if (rspamd_content_disposition_parser (in, len, &val, pool)) {
diff --git a/src/libutil/str_util.c b/src/libutil/str_util.c
index 69b17fb4f1..c111b0a96f 100644
--- a/src/libutil/str_util.c
+++ b/src/libutil/str_util.c
@@ -79,10 +79,12 @@ rspamd_str_lc (gchar *str, guint size)
 	switch (leftover) {
 	case 3:
 		*dest++ = lc_map[(guchar)str[i++]];
+		/* falltrough */
 	case 2:
 		*dest++ = lc_map[(guchar)str[i++]];
+		/* falltrough */
 	case 1:
-		*dest++ = lc_map[(guchar)str[i]];
+		*dest = lc_map[(guchar)str[i]];
 	}
 
 }