diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-02-09 16:43:40 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-02-09 16:43:40 +0000 |
| commit | c2cbcd8d98ae8e1b8d1ef06bc6dc53f77ac3bd16 (patch) | |
| tree | e8742046ad3eac446a64576f9bfd605e583e9ee5 /src/plugins | |
| parent | dcbe3146b882a731e1cd82025607bd423bb82024 (diff) | |
| download | rspamd-c2cbcd8d98ae8e1b8d1ef06bc6dc53f77ac3bd16.tar.gz rspamd-c2cbcd8d98ae8e1b8d1ef06bc6dc53f77ac3bd16.zip | |
Fix some issues found by coverity
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/dkim_check.c | 2 | ||||
| -rw-r--r-- | src/plugins/fuzzy_check.c | 10 | ||||
| -rw-r--r-- | src/plugins/surbl.c | 9 |
3 files changed, 14 insertions, 7 deletions
diff --git a/src/plugins/dkim_check.c b/src/plugins/dkim_check.c index e2e18d4e6..5813d1acd 100644 --- a/src/plugins/dkim_check.c +++ b/src/plugins/dkim_check.c @@ -500,7 +500,7 @@ dkim_module_check (struct dkim_check_result *res) } } - if (all_done && res != NULL) { + if (all_done) { rspamd_session_watcher_pop (res->task->s, res->w); } } diff --git a/src/plugins/fuzzy_check.c b/src/plugins/fuzzy_check.c index 3b2bc54be..9edf7fc9d 100644 --- a/src/plugins/fuzzy_check.c +++ b/src/plugins/fuzzy_check.c @@ -408,10 +408,14 @@ fuzzy_parse_rule (struct rspamd_config *cfg, const ucl_object_t *obj, gint cb_id if ((value = ucl_object_find_key (obj, "servers")) != NULL) { rule->servers = rspamd_upstreams_create (cfg->ups_ctx); + rspamd_mempool_add_destructor (fuzzy_module_ctx->fuzzy_pool, (rspamd_mempool_destruct_t)rspamd_upstreams_destroy, rule->servers); - rspamd_upstreams_from_ucl (rule->servers, value, DEFAULT_PORT, NULL); + if (!rspamd_upstreams_from_ucl (rule->servers, value, DEFAULT_PORT, NULL)) { + msg_err_config ("cannot read servers definition"); + return -1; + } } if ((value = ucl_object_find_key (obj, "fuzzy_map")) != NULL) { it = NULL; @@ -1650,7 +1654,7 @@ fuzzy_controller_timer_callback (gint fd, short what, void *arg) if (*session->saved > 0 ) { (*session->saved)--; - if (*session->saved == 0 && session->task != NULL) { + if (*session->saved == 0) { rspamd_task_free (session->task); session->task = NULL; } @@ -2031,7 +2035,7 @@ fuzzy_process_handler (struct rspamd_http_connection_entry *conn_ent, saved, err); } - if (res) { + if (res > 0) { processed = TRUE; } else if (res == -1) { diff --git a/src/plugins/surbl.c b/src/plugins/surbl.c index 55a9b97ce..ca565f343 100644 --- a/src/plugins/surbl.c +++ b/src/plugins/surbl.c @@ -546,10 +546,13 @@ surbl_module_config (struct rspamd_config *cfg) if ((value = rspamd_config_get_module_opt (cfg, "surbl", "redirector_hosts_map")) != NULL) { - rspamd_map_add (cfg, ucl_obj_tostring ( - value), + if (!rspamd_map_add (cfg, ucl_obj_tostring (value), "SURBL redirectors list", read_redirectors_list, fin_redirectors_list, - (void **)&surbl_module_ctx->redirector_map_data); + (void **)&surbl_module_ctx->redirector_map_data)) { + + msg_warn_config ("bad redirectors map definition: %s", + ucl_obj_tostring (value)); + } } if ((value = |