From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 31 Oct 2017 18:56:28 +0000 (+0000)
Subject: [Fix] Do not try to dereference last character
X-Git-Tag: 1.7.0~496
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=03aa5adf4ba9b4ba08177e70968d534edea1bf05;p=rspamd.git

[Fix] Do not try to dereference last character

MFH: rspamd-1.6
---

diff --git a/src/libstat/tokenizers/tokenizers.c b/src/libstat/tokenizers/tokenizers.c
index f75310fe3..aec801b05 100644
--- a/src/libstat/tokenizers/tokenizers.c
+++ b/src/libstat/tokenizers/tokenizers.c
@@ -198,7 +198,7 @@ rspamd_tokenizer_get_word (rspamd_stat_token_t * buf,
 	p = s;
 	token->begin = s;
 
-	for (i = 0; i <= remain; ) {
+	for (i = 0; i < remain; ) {
 		p = &s[i];
 		U8_NEXT (s, i, remain, uc); /* This also advances i */
 
@@ -254,6 +254,13 @@ rspamd_tokenizer_get_word (rspamd_stat_token_t * buf,
 		}
 	}
 
+	/* Last character */
+	if (state == feed_token) {
+		goto set_token;
+	}
+
+	return FALSE;
+
 set_token:
 	if (rl) {
 		*rl = processed;