From 004a8cb98057fd802ed285a559b1ab0f5b3fda50 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Fri, 22 Jun 2018 16:30:55 +0100 Subject: [PATCH] [Minor] Additional safe guard when removing symbols --- src/libserver/composites.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/libserver/composites.c b/src/libserver/composites.c index 2ac820990..f7c31bb20 100644 --- a/src/libserver/composites.c +++ b/src/libserver/composites.c @@ -422,11 +422,7 @@ composites_remove_symbols (gpointer key, gpointer value, gpointer data) } } - if (has_valid_op) { - if (want_remove_symbol || want_forced) { - rd->ms->flags |= RSPAMD_SYMBOL_RESULT_IGNORED; - msg_debug_composites ("remove symbol %s", key); - } + if (has_valid_op && !(rd->ms->flags & RSPAMD_SYMBOL_RESULT_IGNORED)) { if (want_remove_score || want_forced) { msg_debug_composites ("remove symbol weight for %s (was %.2f)", @@ -434,6 +430,11 @@ composites_remove_symbols (gpointer key, gpointer value, gpointer data) cd->metric_res->score -= rd->ms->score; rd->ms->score = 0.0; } + + if (want_remove_symbol || want_forced) { + rd->ms->flags |= RSPAMD_SYMBOL_RESULT_IGNORED; + msg_debug_composites ("remove symbol %s", key); + } } } -- 2.39.5