From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 18 Aug 2014 13:59:46 +0000 (+0100)
Subject: Fix critical bug in recipients_distance function.
X-Git-Tag: 0.7.0~155
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3f4624d24b2814242415e7cd87f94fb505b897aa;p=rspamd.git

Fix critical bug in recipients_distance function.
---

diff --git a/src/libmime/expressions.c b/src/libmime/expressions.c
index cce1209aa..0289daa57 100644
--- a/src/libmime/expressions.c
+++ b/src/libmime/expressions.c
@@ -1259,10 +1259,10 @@ rspamd_recipients_distance (struct rspamd_task *task, GList * args,
 		return FALSE;
 	}
 
-	if (!task->rcpts) {
+	if (!task->rcpt_mime) {
 		return FALSE;
 	}
-	num = internet_address_list_length (task->rcpts);
+	num = internet_address_list_length (task->rcpt_mime);
 	if (num < MIN_RCPT_TO_COMPARE) {
 		return FALSE;
 	}
@@ -1271,14 +1271,13 @@ rspamd_recipients_distance (struct rspamd_task *task, GList * args,
 			sizeof (struct addr_list));
 
 	/* Fill array */
-	cur = task->rcpts;
+	cur = task->rcpt_mime;
 #ifdef GMIME24
 	for (i = 0; i < num; i++) {
 		addr = internet_address_list_get_address (cur, i);
-		ar[i].name = rspamd_mempool_strdup (task->task_pool,
-				internet_address_get_name (addr));
+		ar[i].name = internet_address_mailbox_get_addr (
+				INTERNET_ADDRESS_MAILBOX (addr));
 		if (ar[i].name != NULL && (c = strchr (ar[i].name, '@')) != NULL) {
-			*c = '\0';
 			ar[i].addr = c + 1;
 		}
 	}