Some sanity checks for tokenizer and classifier.

diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c
index 09e882709454da1a35c57f6f82efc7c70bc3c714..ed6085e79ac2402cbbd53fa220dc8cbdea3fdc5f 100644 (file)
--- a/src/libserver/cfg_rcl.c
+++ b/src/libserver/cfg_rcl.c
@@ -1004,6 +1004,13 @@ rspamd_rcl_classifier_handler (struct rspamd_config *cfg,
        if (found == NULL) {
                ccf = rspamd_config_new_classifier (cfg, NULL);
                ccf->classifier = get_classifier (type);
+               if (ccf->classifier == NULL) {
+                       g_set_error (err,
+                                       CFG_RCL_ERROR,
+                                       EINVAL,
+                                       "unknown classifier: %s", type);
+                       return FALSE;
+               }
        }
        else {
                ccf = found;
@@ -1045,6 +1052,9 @@ rspamd_rcl_classifier_handler (struct rspamd_config *cfg,
        }
 
        if (found == NULL) {
+               if (ccf->tokenizer == NULL) {
+                       ccf->tokenizer = get_tokenizer ("osb-text");
+               }
                cfg->classifiers = g_list_prepend (cfg->classifiers, ccf);
        }