Do not assume invalid header regexps by default

diff --git a/src/libmime/mime_expressions.c b/src/libmime/mime_expressions.c
index 9218b4a027a449da541229f8ff0568221c1250e2..8d42bf9a86ae7fc6e2c4ad04647d4fa1a2869a0b 100644 (file)
--- 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);