From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sat, 27 May 2017 22:45:24 +0000 (+0100)
Subject: [Minor] Add the same duplicates protection for all fuzzy hashes types
X-Git-Tag: 1.5.9~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c7d1e14aa486f93ed7839e96f70acbf1d841d0d;p=thirdparty%2Frspamd.git

[Minor] Add the same duplicates protection for all fuzzy hashes types
---

diff --git a/src/plugins/fuzzy_check.c b/src/plugins/fuzzy_check.c
index a63201bd31..ab326f0fe9 100644
--- a/src/plugins/fuzzy_check.c
+++ b/src/plugins/fuzzy_check.c
@@ -2357,6 +2357,20 @@ fuzzy_generate_commands (struct rspamd_task *task, struct fuzzy_rule *rule,
 									task->task_pool,
 									image->parent->digest);
 							if (io) {
+								gboolean skip_existing = FALSE;
+
+								PTR_ARRAY_FOREACH (res, j, cur) {
+									if (memcmp (cur->cmd.digest, io->cmd.digest,
+											sizeof (io->cmd.digest)) == 0) {
+										skip_existing = TRUE;
+										break;
+									}
+								}
+
+								if (!skip_existing) {
+									g_ptr_array_add (res, io);
+								}
+
 								g_ptr_array_add (res, io);
 							}
 
@@ -2372,6 +2386,20 @@ fuzzy_generate_commands (struct rspamd_task *task, struct fuzzy_rule *rule,
 										task->task_pool,
 										image);
 								if (io) {
+									gboolean skip_existing = FALSE;
+
+									PTR_ARRAY_FOREACH (res, j, cur) {
+										if (memcmp (cur->cmd.digest, io->cmd.digest,
+												sizeof (io->cmd.digest)) == 0) {
+											skip_existing = TRUE;
+											break;
+										}
+									}
+
+									if (!skip_existing) {
+										g_ptr_array_add (res, io);
+									}
+
 									g_ptr_array_add (res, io);
 								}
 							}
@@ -2394,6 +2422,20 @@ fuzzy_generate_commands (struct rspamd_task *task, struct fuzzy_rule *rule,
 							task->task_pool,
 							mime_part->digest);
 					if (io) {
+						gboolean skip_existing = FALSE;
+
+						PTR_ARRAY_FOREACH (res, j, cur) {
+							if (memcmp (cur->cmd.digest, io->cmd.digest,
+									sizeof (io->cmd.digest)) == 0) {
+								skip_existing = TRUE;
+								break;
+							}
+						}
+
+						if (!skip_existing) {
+							g_ptr_array_add (res, io);
+						}
+
 						g_ptr_array_add (res, io);
 					}
 				}