From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 12 Jun 2017 09:23:32 +0000 (+0100)
Subject: [Fix] Fix pools management for milter session
X-Git-Tag: 1.6.0~15
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6e467d152108d6eb84a4dd63f689995c73443268;p=rspamd.git

[Fix] Fix pools management for milter session
---

diff --git a/src/libserver/milter.c b/src/libserver/milter.c
index e7a00b8e6..ca8589185 100644
--- a/src/libserver/milter.c
+++ b/src/libserver/milter.c
@@ -188,6 +188,7 @@ rspamd_milter_session_dtor (struct rspamd_milter_session *session)
 			g_hash_table_destroy (priv->headers);
 		}
 
+		rspamd_mempool_delete (priv->pool);
 		g_free (priv);
 		g_free (session);
 	}
@@ -1010,7 +1011,13 @@ rspamd_milter_handle_socket (gint fd, const struct timeval *tv,
 	priv->parser.buf = rspamd_fstring_sized_new (RSPAMD_MILTER_MESSAGE_CHUNK + 5);
 	priv->ev_base = ev_base;
 	priv->state = RSPAMD_MILTER_READ_MORE;
-	priv->pool = pool;
+	priv->pool = rspamd_mempool_new (rspamd_mempool_suggest_size (), "milter");
+
+	if (pool) {
+		/* Copy tag */
+		memcpy (priv->pool->tag.uid, pool->tag.uid, sizeof (pool->tag.uid));
+	}
+
 	priv->headers = g_hash_table_new_full (rspamd_strcase_hash,
 			rspamd_strcase_equal, g_free, NULL);