Do not tokenize empty input.

diff --git a/src/libmime/filter.c b/src/libmime/filter.c
index 467f30b9cb7ada27c7690bc7326bc515f1bf93f4..a1f042aae7f4040185af0588d816b0a0bb8b8f3a 100644 (file)
--- a/src/libmime/filter.c
+++ b/src/libmime/filter.c
@@ -801,7 +801,10 @@ classifiers_callback (gpointer value, void *arg)
                        }
                        cur = g_list_next (cur);
                }
-               g_hash_table_insert (task->tokens, cl->tokenizer, tokens);
+
+               if (tokens != NULL) {
+                       g_hash_table_insert (task->tokens, cl->tokenizer, tokens);
+               }
        }
 
        /* Take care of subject */

diff --git a/src/tokenizers/osb.c b/src/tokenizers/osb.c
index b879237c4f46bf71f7dd71b37bcaab763b61213a..9dd12a8dd2e3d175982668561f16b7436e79eadf 100644 (file)
--- a/src/tokenizers/osb.c
+++ b/src/tokenizers/osb.c
@@ -49,6 +49,10 @@ osb_tokenize_text (struct tokenizer *tokenizer,
        gint i, processed = 0;
        guint w;
 
+       if (input == NULL) {
+               return FALSE;
+       }
+
        if (*tree == NULL) {
                *tree = g_tree_new (token_node_compare_func);
                rspamd_mempool_add_destructor (pool,