]> source.dussan.org Git - rspamd.git/commitdiff
[Fix] Some more memory issues are fixed
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Thu, 19 Jan 2017 18:09:16 +0000 (18:09 +0000)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Thu, 19 Jan 2017 18:09:16 +0000 (18:09 +0000)
src/libstat/backends/redis_backend.c
src/libutil/upstream.c

index d5df2234e953de88fa1c1ed0f03955e541954344..e869f69ae4a2bffc63f90450ad50a90530dce79c 100644 (file)
@@ -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
index 48ef08329216ae9227e938defa647b80be2d2615..67debb017dcf4af494ddb6bd89e8f3c038d8b120 100644 (file)
@@ -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);