From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 19 Dec 2016 10:05:58 +0000 (+0000)
Subject: [Minor] Cut braces in message id
X-Git-Tag: 1.5.0~553
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=efb04bc038792671dced3b15cc1dca5d3f94e2cc;p=thirdparty%2Frspamd.git

[Minor] Cut braces in message id
---

diff --git a/src/libmime/message.c b/src/libmime/message.c
index 4e74456339..3ba4d34c44 100644
--- a/src/libmime/message.c
+++ b/src/libmime/message.c
@@ -589,7 +589,6 @@ rspamd_message_parse (struct rspamd_task *task)
 	struct received_header *recv, *trecv;
 	const gchar *p;
 	gsize len;
-	goffset hdr_pos, body_pos;
 	gint i;
 	gdouble diff, *pdiff;
 	guint tw, *ptw, dw;
@@ -675,8 +674,24 @@ rspamd_message_parse (struct rspamd_task *task)
 	hdrs = rspamd_message_get_header_array (task, "Message-ID", FALSE);
 
 	if (hdrs) {
+		gchar *p, *end;
+
 		rh = g_ptr_array_index (hdrs, 0);
-		task->message_id = rh->decoded;
+
+		p = rh->decoded;
+		end = p + strlen (p);
+
+		if (*p == '<') {
+			p ++;
+
+			if (end > p && *(end - 1) == '>') {
+				*(end - 1) = '\0';
+				p = rspamd_mempool_strdup (task->task_pool, p);
+				*(end - 1) = '>';
+			}
+		}
+
+		task->message_id = p;
 	}
 
 	if (task->message_id == NULL) {