From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 22 Jun 2018 15:30:55 +0000 (+0100)
Subject: [Minor] Additional safe guard when removing symbols
X-Git-Tag: 1.7.7~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=004a8cb98057fd802ed285a559b1ab0f5b3fda50;p=thirdparty%2Frspamd.git

[Minor] Additional safe guard when removing symbols
---

diff --git a/src/libserver/composites.c b/src/libserver/composites.c
index 2ac8209905..f7c31bb201 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);
+		}
 	}
 }