From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 8 Dec 2015 16:28:24 +0000 (+0000)
Subject: Do not assume invalid header regexps by default
X-Git-Tag: 1.1.0~373
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83deb3e1dd871c984cc4bac4529d8db55202e7d5;p=thirdparty%2Frspamd.git

Do not assume invalid header regexps by default
---

diff --git a/src/libmime/mime_expressions.c b/src/libmime/mime_expressions.c
index 9218b4a027..8d42bf9a86 100644
--- a/src/libmime/mime_expressions.c
+++ b/src/libmime/mime_expressions.c
@@ -239,7 +239,7 @@ rspamd_mime_expr_parse_regexp_atom (rspamd_mempool_t * pool, const gchar *line)
 	}
 	else {
 		result->header = rspamd_mempool_strdup (pool, line);
-		result->type = RSPAMD_RE_HEADER;
+		result->type = RSPAMD_RE_MAX;
 		line = start;
 	}
 	/* Find begin of regexp */
@@ -329,6 +329,11 @@ rspamd_mime_expr_parse_regexp_atom (rspamd_mempool_t * pool, const gchar *line)
 		}
 	}
 
+	if (result->type >= RSPAMD_RE_MAX) {
+		msg_err_pool ("could not read regexp: %s, unknown type", src);
+		return NULL;
+	}
+
 	result->regexp_text = rspamd_mempool_strdup (pool, start);
 	dbegin = result->regexp_text + (begin - start);
 	dend = result->regexp_text + (end - start);