From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 13 Mar 2015 13:22:38 +0000 (+0000)
Subject: Some sanity checks for tokenizer and classifier.
X-Git-Tag: 0.8.3~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a01dea743ce4cd0ff1b8d821deab865181dd80a;p=thirdparty%2Frspamd.git

Some sanity checks for tokenizer and classifier.
---

diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c
index 09e8827094..ed6085e79a 100644
--- 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);
 	}