From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 23 Dec 2015 16:03:48 +0000 (+0000)
Subject: Fix crash in re_cache as headers are not NULL terminated
X-Git-Tag: 1.1.0~217
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b19414d0310cbbac21b88188cc48eb6627df3c0;p=thirdparty%2Frspamd.git

Fix crash in re_cache as headers are not NULL terminated
---

diff --git a/src/libmime/mime_expressions.c b/src/libmime/mime_expressions.c
index cf9f29fac9..57275e0046 100644
--- a/src/libmime/mime_expressions.c
+++ b/src/libmime/mime_expressions.c
@@ -636,7 +636,7 @@ set:
 					mime_atom->d.re->type == RSPAMD_RE_RAWHEADER) {
 				rspamd_re_cache_add (cfg->re_cache, mime_atom->d.re->regexp,
 						mime_atom->d.re->type, mime_atom->d.re->header,
-						strlen (mime_atom->d.re->header));
+						strlen (mime_atom->d.re->header) + 1);
 			}
 			else {
 				rspamd_re_cache_add (cfg->re_cache, mime_atom->d.re->regexp,
diff --git a/src/lua/lua_config.c b/src/lua/lua_config.c
index 0e61ead07e..8a8ac9e6fe 100644
--- a/src/lua/lua_config.c
+++ b/src/lua/lua_config.c
@@ -1609,7 +1609,7 @@ lua_config_register_regexp (lua_State *L)
 				}
 
 				rspamd_re_cache_add (cfg->re_cache, re->re, type,
-						(gpointer) header_str, header_len);
+						(gpointer) header_str, header_len + 1);
 			}
 		}
 	}