[Fix] Escape utf in regexp to dodge ragel/hyperscan issue

diff --git a/src/libmime/mime_expressions.c b/src/libmime/mime_expressions.c
index 7a0c27f1bc96541010a9cf1d97b01a3f34b270b6..89111743bf02c08120e6780a8bf05cc3d52e1628 100644 (file)
--- a/src/libmime/mime_expressions.c
+++ b/src/libmime/mime_expressions.c
@@ -491,9 +491,14 @@ rspamd_mime_expr_parse_regexp_atom (rspamd_mempool_t * pool, const gchar *line,
        dend = result->regexp_text + (end - start);
        *dend = '\0';
 
-       result->regexp = rspamd_regexp_new (dbegin, re_flags->str,
+       gsize esc_len;
+       gchar *escaped = rspamd_str_regexp_escape (dbegin, dend - dbegin, &esc_len,
+                       RSPAMD_REGEXP_ESCAPE_UTF);
+
+       result->regexp = rspamd_regexp_new (escaped, re_flags->str,
                        &err);
 
+       g_free (escaped);
        g_string_free (re_flags, TRUE);
 
        if (result->regexp == NULL || err != NULL) {

diff --git a/src/libutil/str_util.c b/src/libutil/str_util.c
index 290110b2bd9539e8751e4304deae62eb78c1d778..0c8ff71443e810014f7efbf5fd442210356c5949 100644 (file)
--- a/src/libutil/str_util.c
+++ b/src/libutil/str_util.c
@@ -2591,7 +2591,7 @@ out:
 
 gchar *
 rspamd_str_regexp_escape (const gchar *pattern, gsize slen,
-               gsize *dst_len, enum rspamd_regexp_escape_flags flags)
+                                                 gsize *dst_len, enum rspamd_regexp_escape_flags flags)
 {
        const gchar *p, *end = pattern + slen;
        gchar *res, *d, t, *tmp_utf = NULL, *dend;

diff --git a/src/libutil/str_util.h b/src/libutil/str_util.h
index 8e8898a32bc68457830303d227a540cab24dee53..4a5a8a63a9c308a5053762e3074d622c28464cf5 100644 (file)
--- a/src/libutil/str_util.h
+++ b/src/libutil/str_util.h
@@ -466,7 +466,7 @@ enum rspamd_regexp_escape_flags {
  */
 gchar *
 rspamd_str_regexp_escape (const gchar *pattern, gsize slen,
-               gsize *dst_len, enum rspamd_regexp_escape_flags flags);
+                                                 gsize *dst_len, enum rspamd_regexp_escape_flags flags);
 
 /**
  * Returns copy of src (zero terminated) where all unicode is made valid or replaced