From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 15 Dec 2017 07:55:36 +0000 (+0000)
Subject: [Minor] Add some sanity checks when doing simple canonicalization
X-Git-Tag: 1.6.6~3^2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22a9f37179f0de0f0ee0f7eee37c7f13415f2861;p=thirdparty%2Frspamd.git

[Minor] Add some sanity checks when doing simple canonicalization
---

diff --git a/src/libserver/dkim.c b/src/libserver/dkim.c
index 522f96a78d..62b1f9cc36 100644
--- a/src/libserver/dkim.c
+++ b/src/libserver/dkim.c
@@ -1744,18 +1744,20 @@ rspamd_dkim_hash_update (EVP_MD_CTX *ck, const gchar *begin, gsize len)
 	end = begin + len;
 	p = begin;
 	c = p;
-	while (p != end) {
+
+	while (p < end) {
 		if (*p == '\r') {
-			EVP_DigestUpdate (ck, c,	 p - c);
+			EVP_DigestUpdate (ck, c, p - c);
 			EVP_DigestUpdate (ck, CRLF, sizeof (CRLF) - 1);
 			p++;
-			if (*p == '\n') {
+
+			if (p < end && *p == '\n') {
 				p++;
 			}
 			c = p;
 		}
 		else if (*p == '\n') {
-			EVP_DigestUpdate (ck, c,	 p - c);
+			EVP_DigestUpdate (ck, c, p - c);
 			EVP_DigestUpdate (ck, CRLF, sizeof (CRLF) - 1);
 			p++;
 			c = p;
@@ -1764,7 +1766,8 @@ rspamd_dkim_hash_update (EVP_MD_CTX *ck, const gchar *begin, gsize len)
 			p++;
 		}
 	}
-	if (p != c) {
+
+	if (p > c) {
 		EVP_DigestUpdate (ck, c, p - c);
 	}
 }