From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 16 Jul 2015 15:48:49 +0000 (+0100)
Subject: Fix parts distance compare condition.
X-Git-Tag: 1.0.0~347
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4b1afa8fcb2e5caa27204740b479f8867207ec37;p=thirdparty%2Frspamd.git

Fix parts distance compare condition.
---

diff --git a/src/libmime/message.c b/src/libmime/message.c
index fe435253a7..6c1bad06c5 100644
--- a/src/libmime/message.c
+++ b/src/libmime/message.c
@@ -1666,33 +1666,34 @@ rspamd_message_parse (struct rspamd_task *task)
 				debug_task (
 						"two parts are not belong to multipart/alternative container, skip check");
 			}
+			else {
+				if (!IS_PART_EMPTY (p1) && !IS_PART_EMPTY (p2) &&
+						p1->normalized_words && p2->normalized_words) {
+
+					tw = MAX (p1->normalized_words->len, p2->normalized_words->len);
+					dw = rspamd_words_levenshtein_distance (p1->normalized_words,
+							p2->normalized_words);
+					diff = tw > 0 ? (100.0 * (gdouble)(tw - dw) / (gdouble)tw) : 100;
+
+					msg_info (
+							"different words: %d, total words: %d, "
+							"got likeliness between parts of %d%%",
+							dw, tw,
+							diff);
+
+					pdiff = rspamd_mempool_alloc (task->task_pool, sizeof (gint));
+					*pdiff = diff;
+					rspamd_mempool_set_variable (task->task_pool,
+							"parts_distance",
+							pdiff,
+							NULL);
+				}
+			}
 		}
 		else {
 			debug_task (
 					"message contains two parts but they are in different multi-parts");
 		}
-
-		if (!IS_PART_EMPTY (p1) && !IS_PART_EMPTY (p2) &&
-				p1->normalized_words && p2->normalized_words) {
-
-			tw = MAX (p1->normalized_words->len, p2->normalized_words->len);
-			dw = rspamd_words_levenshtein_distance (p1->normalized_words,
-					p2->normalized_words);
-			diff = tw > 0 ? (100.0 * (gdouble)(tw - dw) / (gdouble)tw) : 100;
-
-			msg_info (
-					"different words: %d, total words: %d, "
-					"got likeliness between parts of %d%%",
-					dw, tw,
-					diff);
-
-			pdiff = rspamd_mempool_alloc (task->task_pool, sizeof (gint));
-			*pdiff = diff;
-			rspamd_mempool_set_variable (task->task_pool,
-					"parts_distance",
-					pdiff,
-					NULL);
-		}
 	}
 	else {
 		debug_task (