daemon: fix leaking of session2

diff --git a/daemon/session2.c b/daemon/session2.c
index 04e6faa2dd9abfb6a122e6abd88a9419f492fbd7..f5c4de3c532494caa03ea0ff0d5d9ec16d3067c8 100644 (file)
--- a/daemon/session2.c
+++ b/daemon/session2.c
@@ -556,7 +556,7 @@ struct session2 *session2_new(enum session2_transport_type transport_type,
        }
        s->layers = layers;
 
-       mm_ctx_mempool(&s->pool, 4 * CPU_PAGE_SIZE);
+       mm_ctx_mempool(&s->pool, CPU_PAGE_SIZE);
        queue_init(s->waiting);
 
        int ret = wire_buf_init(&s->wire_buf, KNOT_WIRE_MAX_PKTSIZE);
@@ -575,13 +575,15 @@ static void session2_timer_on_close(uv_handle_t *handle)
 {
        struct session2 *s = handle->data;
        protolayer_manager_free(s->layers);
+       wire_buf_deinit(&s->wire_buf);
+       mm_ctx_delete(&s->pool);
+       trie_free(s->tasks);
+       queue_deinit(s->waiting);
        free(s);
 }
 
 void session2_free(struct session2 *s)
 {
-       trie_free(s->tasks);
-       queue_deinit(s->waiting);
        uv_close((uv_handle_t *)&s->timer, session2_timer_on_close);
 }
 
@@ -1129,11 +1131,18 @@ static inline int session2_transport_push(struct session2 *s,
                        session2_transport_single_push_finished, ctx);
 }
 
+static void on_session2_handle_close(uv_handle_t *handle)
+{
+       struct session2 *session = handle->data;
+       kr_require(session->transport.type == SESSION2_TRANSPORT_IO &&
+                       session->transport.io.handle == handle);
+       io_free(handle);
+}
+
 static int session2_handle_close(struct session2 *s, uv_handle_t *handle)
 {
        io_stop_read(handle);
-       uv_close(handle, NULL);
-
+       uv_close(handle, on_session2_handle_close);
        return kr_ok();
 }
 

diff --git a/daemon/worker.c b/daemon/worker.c
index 48f3898a92aea397df242934c3a1db6517ee0783..a1a8ce84d6b3ffeecf2572e7d38aaf48601f8de1 100644 (file)
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -511,9 +511,8 @@ static void qr_task_free(struct qr_task *task)
        if (kr_fails_assert(ctx))
                return;
 
-       if (ctx->task == NULL) {
-               request_free(ctx);
-       }
+       kr_require(ctx->task == NULL);
+       request_free(ctx);
 
        /* Update stats */
        the_worker->stats.concurrent -= 1;