From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 11 Oct 2018 19:48:50 +0000 (+0100)
Subject: [Minor] Add some fail-safety
X-Git-Tag: 1.8.1~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ca3a40439aba6681401521d8d43f4e283b4a72d5;p=thirdparty%2Frspamd.git

[Minor] Add some fail-safety
---

diff --git a/src/libmime/filter.c b/src/libmime/filter.c
index ba1e821f39..ad9a53a2f1 100644
--- a/src/libmime/filter.c
+++ b/src/libmime/filter.c
@@ -72,8 +72,15 @@ rspamd_create_metric_result (struct rspamd_task *task)
 		kh_resize (rspamd_symbols_hash, metric_res->symbols, 4);
 	}
 
-	for (i = 0; i < METRIC_ACTION_MAX; i++) {
-		metric_res->actions_limits[i] = task->cfg->actions[i].score;
+	if (task->cfg) {
+		for (i = 0; i < METRIC_ACTION_MAX; i++) {
+			metric_res->actions_limits[i] = task->cfg->actions[i].score;
+		}
+	}
+	else {
+		for (i = 0; i < METRIC_ACTION_MAX; i++) {
+			metric_res->actions_limits[i] = NAN;
+		}
 	}
 
 	rspamd_mempool_add_destructor (task->task_pool,
diff --git a/src/rspamadm/lua_repl.c b/src/rspamadm/lua_repl.c
index 2df02a9de3..a43527823c 100644
--- a/src/rspamadm/lua_repl.c
+++ b/src/rspamadm/lua_repl.c
@@ -431,7 +431,7 @@ rspamadm_lua_message_handler (lua_State *L, gint argc, gchar **argv)
 			rspamd_printf ("cannot open %s: %s\n", argv[i], strerror (errno));
 		}
 		else {
-			task = rspamd_task_new (NULL, NULL, NULL, NULL);
+			task = rspamd_task_new (NULL, rspamd_main->cfg, NULL, NULL);
 
 			if (!rspamd_task_load_message (task, NULL, map, len)) {
 				rspamd_printf ("cannot load %s\n", argv[i]);