diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-01-15 15:54:43 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-01-15 15:54:43 +0000 |
| commit | 27e45bef83fe17b339fe345e3455a67b7416e1d3 (patch) | |
| tree | a916601653c8eaca9488d7dd55b4de565078047d /src/libmime/mime_expressions.c | |
| parent | 46fd25c4dda2e4cc25f662dc5cb5dad0d4380503 (diff) | |
| download | rspamd-27e45bef83fe17b339fe345e3455a67b7416e1d3.tar.gz rspamd-27e45bef83fe17b339fe345e3455a67b7416e1d3.zip | |
Fix warnings.
Diffstat (limited to 'src/libmime/mime_expressions.c')
| -rw-r--r-- | src/libmime/mime_expressions.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/libmime/mime_expressions.c b/src/libmime/mime_expressions.c index be9912463..ad550f3bf 100644 --- a/src/libmime/mime_expressions.c +++ b/src/libmime/mime_expressions.c @@ -1560,7 +1560,7 @@ rspamd_content_type_compare_param (struct rspamd_task * task, GMimeContentType *ct; gint r; guint i; - gboolean recursive = FALSE, result = FALSE; + gboolean recursive = FALSE; struct mime_part *cur_part; if (args == NULL || args->len < 2) { @@ -1600,14 +1600,15 @@ rspamd_content_type_compare_param (struct rspamd_task * task, if ((param_data = g_mime_content_type_get_parameter ((GMimeContentType *)ct, - param_name)) == NULL) { - result = FALSE; - } - else { + param_name)) != NULL) { if (arg_pattern->type == EXPRESSION_ARGUMENT_REGEXP) { re = arg_pattern->data; r = rspamd_regexp_search (re, param_data, 0, NULL, NULL, FALSE, NULL); + + if (r) { + return TRUE; + } } else { /* Just do strcasecmp */ @@ -1745,6 +1746,10 @@ rspamd_content_type_check (struct rspamd_task *task, re = arg_pattern->data; r = rspamd_regexp_search (re, param_data, 0, NULL, NULL, FALSE, NULL); + + if (r) { + return TRUE; + } } else { /* Just do strcasecmp */ |