From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 27 Mar 2018 12:25:21 +0000 (+0100)
Subject: [Minor] Fix out-of-boundary access
X-Git-Tag: 1.7.3~99
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f03c7fe732ba335f84514bccac42d649f5c998ca;p=thirdparty%2Frspamd.git

[Minor] Fix out-of-boundary access
---

diff --git a/src/libmime/message.c b/src/libmime/message.c
index 756cd9b478..37882aaf60 100644
--- a/src/libmime/message.c
+++ b/src/libmime/message.c
@@ -404,7 +404,7 @@ rspamd_strip_newlines_parse (const gchar *begin, const gchar *pe,
 						part->spaces ++;
 					}
 
-					if (*p == '\r' || *p == '\n') {
+					if (p < pe && (*p == '\r' || *p == '\n')) {
 						part->empty_lines ++;
 					}
 				}
@@ -419,6 +419,10 @@ rspamd_strip_newlines_parse (const gchar *begin, const gchar *pe,
 
 	/* Leftover */
 	if (p > c) {
+		if (p > pe) {
+			p = pe;
+		}
+
 		switch (state) {
 		case normal_char:
 			g_byte_array_append (part->stripped_content,
diff --git a/src/libstat/tokenizers/tokenizers.c b/src/libstat/tokenizers/tokenizers.c
index d253c1aa68..36861b1965 100644
--- a/src/libstat/tokenizers/tokenizers.c
+++ b/src/libstat/tokenizers/tokenizers.c
@@ -338,7 +338,7 @@ rspamd_tokenize_text (gchar *text, gsize len, gboolean is_utf,
 {
 	rspamd_stat_token_t token, buf;
 	const gchar *pos = NULL;
-	gsize l;
+	gsize l = 0;
 	GArray *res;
 	GList *cur = exceptions;
 	token_get_function func;