diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-03-13 15:01:18 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-03-13 15:01:55 +0000 |
| commit | f7aee39a9dc81ae437e1dcc651a7335a7ae071d3 (patch) | |
| tree | 491a5422b5e32feabad05fca0cdb9ae196f731a5 /src/libserver | |
| parent | 376b5cac00888b7d3203f2c3e5611b0d25044c6b (diff) | |
| download | rspamd-f7aee39a9dc81ae437e1dcc651a7335a7ae071d3.tar.gz rspamd-f7aee39a9dc81ae437e1dcc651a7335a7ae071d3.zip | |
[Fix] Fix various issues found by PVS Studio
https://www.viva64.com/
Diffstat (limited to 'src/libserver')
| -rw-r--r-- | src/libserver/dkim.c | 2 | ||||
| -rw-r--r-- | src/libserver/milter.c | 6 | ||||
| -rw-r--r-- | src/libserver/rspamd_symcache.c | 1 | ||||
| -rw-r--r-- | src/libserver/task.c | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/libserver/dkim.c b/src/libserver/dkim.c index 9692d1b93..8100f8ee3 100644 --- a/src/libserver/dkim.c +++ b/src/libserver/dkim.c @@ -2664,6 +2664,7 @@ rspamd_dkim_sign_key_load (const gchar *key, gsize len, if (stat (key, &st) != 0) { g_set_error (err, dkim_error_quark (), DKIM_SIGERROR_KEYFAIL, "cannot stat key file: '%s' %s", key, strerror (errno)); + g_free (nkey); return NULL; } @@ -2674,6 +2675,7 @@ rspamd_dkim_sign_key_load (const gchar *key, gsize len, if (map == NULL) { g_set_error (err, dkim_error_quark (), DKIM_SIGERROR_KEYFAIL, "cannot map key file: '%s' %s", key, strerror (errno)); + g_free (nkey); return NULL; } diff --git a/src/libserver/milter.c b/src/libserver/milter.c index 236a4bf75..fcdbcae6c 100644 --- a/src/libserver/milter.c +++ b/src/libserver/milter.c @@ -1301,7 +1301,7 @@ rspamd_milter_del_header (struct rspamd_milter_session *session, value.len = 0; return rspamd_milter_send_action (session, RSPAMD_MILTER_CHGHEADER, - idx, name, value); + idx, name, &value); } void @@ -1935,7 +1935,7 @@ rspamd_milter_send_task_results (struct rspamd_milter_session *session, } } - rspamd_milter_set_reply (session, rcode, xcode, reply); + rspamd_milter_set_reply (session, xcode, rcode, reply); } break; case METRIC_ACTION_SOFT_REJECT: @@ -1949,7 +1949,7 @@ rspamd_milter_send_task_results (struct rspamd_milter_session *session, sizeof (RSPAMD_MILTER_TEMPFAIL_MESSAGE) - 1); } - rspamd_milter_set_reply (session, rcode, xcode, reply); + rspamd_milter_set_reply (session, xcode, rcode, reply); break; case METRIC_ACTION_REWRITE_SUBJECT: diff --git a/src/libserver/rspamd_symcache.c b/src/libserver/rspamd_symcache.c index 3cfb15408..64e451f7a 100644 --- a/src/libserver/rspamd_symcache.c +++ b/src/libserver/rspamd_symcache.c @@ -1580,7 +1580,6 @@ rspamd_symcache_make_checkpoint (struct rspamd_task *task, checkpoint->pass = RSPAMD_CACHE_PASS_INIT; task->checkpoint = checkpoint; - task->result = task->result; return checkpoint; } diff --git a/src/libserver/task.c b/src/libserver/task.c index 30bccb81b..c4e69c974 100644 --- a/src/libserver/task.c +++ b/src/libserver/task.c @@ -1231,7 +1231,7 @@ rspamd_task_write_ialist (struct rspamd_task *task, struct rspamd_email_address *addr; gint i, nchars = 0, cur_chars; - if (lim <= 0) { + if (addrs && lim <= 0) { lim = addrs->len; } |