From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 27 Nov 2018 18:33:45 +0000 (+0000)
Subject: [Fix] Some fixes for raw parts
X-Git-Tag: 1.8.3~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c0970499e5aa238df5e12cabba9f10388c56215;p=thirdparty%2Frspamd.git

[Fix] Some fixes for raw parts
---

diff --git a/src/libstat/tokenizers/tokenizers.c b/src/libstat/tokenizers/tokenizers.c
index 59e58809f0..51c711cf83 100644
--- 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 f0f16f4233..a3246ae9f1 100644
--- 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);