diff options
author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2018-06-19 19:12:12 +0100 |
---|---|---|
committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2018-06-19 19:12:12 +0100 |
commit | 4424324ba00d4dff20d66e7f544ea1cef3cea43b (patch) | |
tree | 9f1a94f7b8a2a49a0c945051ca276d902ac0a3a0 /src | |
parent | afb5bf3cbf718f231e344947ce5fd3d660961139 (diff) | |
download | rspamd-4424324ba00d4dff20d66e7f544ea1cef3cea43b.tar.gz rspamd-4424324ba00d4dff20d66e7f544ea1cef3cea43b.zip |
[Minor] Fix task creation
Diffstat (limited to 'src')
-rw-r--r-- | src/libserver/task.c | 5 | ||||
-rw-r--r-- | src/lua/lua_task.c | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/libserver/task.c b/src/libserver/task.c index 8994214a5..f626a8c7b 100644 --- a/src/libserver/task.c +++ b/src/libserver/task.c @@ -79,7 +79,10 @@ rspamd_task_new (struct rspamd_worker *worker, struct rspamd_config *cfg, new_task->flags |= RSPAMD_TASK_FLAG_PASS_ALL; } - new_task->re_rt = rspamd_re_cache_runtime_new (cfg->re_cache); + + if (cfg->re_cache) { + new_task->re_rt = rspamd_re_cache_runtime_new (cfg->re_cache); + } if (new_task->lang_det == NULL && cfg->lang_det != NULL) { new_task->lang_det = cfg->lang_det; diff --git a/src/lua/lua_task.c b/src/lua/lua_task.c index 94d4c05dc..ca55609a7 100644 --- a/src/lua/lua_task.c +++ b/src/lua/lua_task.c @@ -1226,7 +1226,12 @@ lua_task_load_from_file (lua_State * L) if (fname) { if (lua_type (L, 2) == LUA_TUSERDATA) { - cfg = rspamd_lua_check_udata_maybe (L, 2, "rspamd{config}"); + gpointer p; + p = rspamd_lua_check_udata_maybe (L, 2, "rspamd{config}"); + + if (p) { + cfg = *(struct rspamd_config **)p; + } } map = rspamd_file_xmap (fname, PROT_READ, &sz, TRUE); |