]> source.dussan.org Git - rspamd.git/commitdiff
[Minor] Add some fail-safety
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Thu, 11 Oct 2018 19:48:50 +0000 (20:48 +0100)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Thu, 11 Oct 2018 19:48:50 +0000 (20:48 +0100)
src/libmime/filter.c
src/rspamadm/lua_repl.c

index ba1e821f39e4812d0d49d1826569d5b05713d0fc..ad9a53a2f19a47517d3998769a16363fdc8916ba 100644 (file)
@@ -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,
index 2df02a9de3fecd0920bb24a3b8e483a82a07d976..a43527823c13d5125b7ecab89a2f92aad7a5875b 100644 (file)
@@ -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]);