commit e9794d5: [Minor] Move checks to the correct branch

Vsevolod Stakhov vsevolod at rspamd.com
Wed Nov 2 21:49:03 UTC 2022


Author: Vsevolod Stakhov
Date: 2022-11-02 21:45:00 +0000
URL: https://github.com/rspamd/rspamd/commit/e9794d53f3882ec44fba535a14249058d552d248 (HEAD -> master)

[Minor] Move checks to the correct branch

---
 src/libmime/scan_result.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/libmime/scan_result.c b/src/libmime/scan_result.c
index 137f30ca0..e160d34a7 100644
--- a/src/libmime/scan_result.c
+++ b/src/libmime/scan_result.c
@@ -319,9 +319,6 @@ insert_metric_result (struct rspamd_task *task,
 		}
 		else {
 			if (sdef) {
-				max_shots = sdef->nshots;
-			}
-			else {
 				if (sdef->groups) {
 					PTR_ARRAY_FOREACH(sdef->groups, i, gr) {
 						if (gr->flags & RSPAMD_SYMBOL_GROUP_ONE_SHOT) {
@@ -329,9 +326,11 @@ insert_metric_result (struct rspamd_task *task,
 						}
 					}
 				}
-				else {
-					max_shots = task->cfg->default_max_shots;
-				}
+
+				max_shots = MIN(max_shots, sdef->nshots);
+			}
+			else {
+				max_shots = task->cfg->default_max_shots;
 			}
 		}
 


More information about the Commits mailing list