From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 10 Mar 2020 15:48:56 +0000 (+0000)
Subject: [Fix] Fix variables replacement in mempool
X-Git-Tag: 2.5~77
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ffd4fe64e1e3c9d4ae7cf942c7179a8715e4a63;p=thirdparty%2Frspamd.git

[Fix] Fix variables replacement in mempool
---

diff --git a/src/libutil/mem_pool.c b/src/libutil/mem_pool.c
index 357e8b693a..b92579e367 100644
--- a/src/libutil/mem_pool.c
+++ b/src/libutil/mem_pool.c
@@ -1186,6 +1186,15 @@ rspamd_mempool_set_variable (rspamd_mempool_t *pool,
 	else {
 		struct rspamd_mempool_variable *pvar;
 
+		if (r == 0) {
+			/* Existing entry, maybe need cleanup */
+			pvar = &kh_val (pool->priv->variables, it);
+
+			if (pvar->dtor) {
+				pvar->dtor (pvar->data);
+			}
+		}
+
 		pvar = &kh_val (pool->priv->variables, it);
 		pvar->data = value;
 		pvar->dtor = destructor;