From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 19 Jan 2017 18:09:16 +0000 (+0000)
Subject: [Fix] Some more memory issues are fixed
X-Git-Tag: 1.5.0~296
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f33a30cb3ebfc38245b0a1b5f77771d266a08d41;p=thirdparty%2Frspamd.git

[Fix] Some more memory issues are fixed
---

diff --git a/src/libstat/backends/redis_backend.c b/src/libstat/backends/redis_backend.c
index d5df2234e9..e869f69ae4 100644
--- a/src/libstat/backends/redis_backend.c
+++ b/src/libstat/backends/redis_backend.c
@@ -602,6 +602,10 @@ rspamd_redis_stat_keys (redisAsyncContext *c, gpointer r, gpointer priv)
 				"users", 0, false);
 
 		rspamd_upstream_ok (cbdata->selected);
+
+		if (cbdata->inflight == 0) {
+			rspamd_redis_async_cbdata_cleanup (cbdata);
+		}
 	}
 	else {
 		if (c->errstr) {
@@ -613,10 +617,6 @@ rspamd_redis_stat_keys (redisAsyncContext *c, gpointer r, gpointer priv)
 		rspamd_upstream_fail (cbdata->selected);
 		rspamd_redis_async_cbdata_cleanup (cbdata);
 	}
-
-	if (cbdata->inflight == 0) {
-		rspamd_redis_async_cbdata_cleanup (cbdata);
-	}
 }
 
 static void
diff --git a/src/libutil/upstream.c b/src/libutil/upstream.c
index 48ef083292..67debb017d 100644
--- a/src/libutil/upstream.c
+++ b/src/libutil/upstream.c
@@ -507,7 +507,6 @@ rspamd_upstream_dtor (struct upstream *up)
 	}
 
 	rspamd_mutex_free (up->lock);
-	g_free (up->name);
 
 	if (up->ctx) {
 		g_queue_delete_link (up->ctx->upstreams, up->ctx_pos);