From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 30 Sep 2016 11:12:17 +0000 (+0100)
Subject: [Minor] Try to fix some memory inconsistencies
X-Git-Tag: 1.4.0~353
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03165efaa67359fdcabb6206ed02cba36498be5a;p=thirdparty%2Frspamd.git

[Minor] Try to fix some memory inconsistencies
---

diff --git a/contrib/lc-btrie/btrie.c b/contrib/lc-btrie/btrie.c
index d95bf0676d..51357a1d63 100644
--- a/contrib/lc-btrie/btrie.c
+++ b/contrib/lc-btrie/btrie.c
@@ -1380,9 +1380,10 @@ btrie_init(rspamd_mempool_t *mp)
 {
 	struct btrie *btrie;
 
-	if (!(btrie = rspamd_mempool_alloc (mp, sizeof(*btrie))))
+	if (!(btrie = rspamd_mempool_alloc0 (mp, sizeof(*btrie)))) {
 		return NULL;
-	memset(btrie, 0, sizeof(*btrie));
+	}
+
 	btrie->mp = mp;
 	btrie->alloc_total = sizeof(*btrie);
 
diff --git a/src/lua/lua_redis.c b/src/lua/lua_redis.c
index 4021903514..455afd9b66 100644
--- a/src/lua/lua_redis.c
+++ b/src/lua/lua_redis.c
@@ -219,6 +219,7 @@ lua_redis_fin (void *arg)
 	event_del (&sp_ud->timeout);
 	msg_debug ("finished redis query %p from session %p", sp_ud, ctx);
 	sp_ud->replied = TRUE;
+	sp_ud->c->terminated = TRUE;
 
 	REDIS_RELEASE (ctx);
 }