diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-12-15 07:55:36 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-12-15 07:55:36 +0000 |
| commit | 252f641b0b8b80f80973358d082f1d1aa1418b28 (patch) | |
| tree | 0cf17dbc0c14b322727876d18b861fe0f711df59 | |
| parent | ba48159c222d01adb2152f336b301d32cf3772a9 (diff) | |
| download | rspamd-252f641b0b8b80f80973358d082f1d1aa1418b28.tar.gz rspamd-252f641b0b8b80f80973358d082f1d1aa1418b28.zip | |
[Minor] Add some sanity checks when doing simple canonicalization
| -rw-r--r-- | src/libserver/dkim.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/libserver/dkim.c b/src/libserver/dkim.c index a9c4ae66f..d3aa7c0bc 100644 --- a/src/libserver/dkim.c +++ b/src/libserver/dkim.c @@ -1868,18 +1868,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; @@ -1888,7 +1890,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); } } |