[Minor] Try to fix some memory inconsistencies

diff --git a/contrib/lc-btrie/btrie.c b/contrib/lc-btrie/btrie.c
index d95bf0676d1ac1e3aa2b31b21b9af8eeba8bc118..51357a1d63be52f9863a621af0b80bedddb76f5c 100644 (file)
--- 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 4021903514076bdf096e53c66a701ea62330aaea..455afd9b664c15d6fc7dec034291d794dcc077fb 100644 (file)
--- 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);
 }