From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 12 Aug 2014 11:51:48 +0000 (+0100)
Subject: Fix buffer overrun when HTML exceptions are used.
X-Git-Tag: 0.6.10~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65abf31f226588d7eb3315d8b07449b4cb7f22bf;p=thirdparty%2Frspamd.git

Fix buffer overrun when HTML exceptions are used.
---

diff --git a/src/tokenizers/tokenizers.c b/src/tokenizers/tokenizers.c
index 43dcfac82a..040c1dd796 100644
--- a/src/tokenizers/tokenizers.c
+++ b/src/tokenizers/tokenizers.c
@@ -137,11 +137,12 @@ get_next_word (f_str_t * buf, f_str_t * token, GList **exceptions)
 
 	token->len = 0;
 
-	remain = buf->len - (token->begin - buf->begin);
-	if (remain == 0) {
+	pos = token->begin - buf->begin;
+	if (pos >= buf->len) {
 		return NULL;
 	}
-	pos = token->begin - buf->begin;
+
+	remain = buf->len - pos;
 	p = token->begin;
 	/* Skip non delimiters symbols */
 	do {