[Fix] Some fixes for raw parts

diff --git a/src/libstat/tokenizers/tokenizers.c b/src/libstat/tokenizers/tokenizers.c
index 59e58809f0671951efb34e7ded9f873a6f23c576..51c711cf83e7ff1a7e78f9e9cd99d45d8d4e63f0 100644 (file)
--- a/src/libstat/tokenizers/tokenizers.c
+++ b/src/libstat/tokenizers/tokenizers.c
@@ -744,6 +744,7 @@ rspamd_normalize_single_word (rspamd_stat_token_t *tok, rspamd_mempool_t *pool)
                        rspamd_strlcpy (dest, tok->original.begin, tok->original.len + 1);
                        rspamd_str_lc (dest, tok->original.len);
                        tok->normalized.len = tok->original.len;
+                       tok->normalized.begin = dest;
                }
        }
 }

diff --git a/src/libutil/regexp.c b/src/libutil/regexp.c
index f0f16f42330989b7b3e116f92be0423d4c9e9020..a3246ae9f18bcd154b7b0123f47edfc9776670e4 100644 (file)
--- a/src/libutil/regexp.c
+++ b/src/libutil/regexp.c
@@ -570,7 +570,11 @@ rspamd_regexp_search (rspamd_regexp_t *re, const gchar *text, gsize len,
 #endif
        }
 
-       g_assert (r != NULL);
+       if (r == NULL) {
+               /* Invalid regexp type for the specified input */
+               return FALSE;
+       }
+
        ncaptures = (re->ncaptures + 1) * 3;
        ovec = g_alloca (sizeof (gint) * ncaptures);