diff -r 545010bc5e71 -r 22eca559aded src/server/daemon/sessionhandler.c
--- a/src/server/daemon/sessionhandler.c	Sun Nov 20 12:43:44 2022 +0100
+++ b/src/server/daemon/sessionhandler.c	Sat Nov 26 17:07:08 2022 +0100
@@ -124,8 +124,8 @@
 }
 
 
-SessionHandler* create_basic_session_handler() {
-    BasicSessionHandler *handler = malloc(sizeof(BasicSessionHandler));
+SessionHandler* create_basic_session_handler(pool_handle_t *pool) {
+    BasicSessionHandler *handler = pool_malloc(pool, sizeof(BasicSessionHandler));
     handler->threadpool = threadpool_new(4, 8);
     threadpool_start(handler->threadpool); // TODO: handle error
     handler->sh.enqueue_connection = basic_enq_conn;
@@ -212,8 +212,8 @@
 
 /* ----- event session handler ----- */
 
-SessionHandler* create_event_session_handler() {
-    EventSessionHandler *handler = malloc(sizeof(EventSessionHandler));
+SessionHandler* create_event_session_handler(pool_handle_t *pool) {
+    EventSessionHandler *handler = pool_malloc(pool, sizeof(EventSessionHandler));
     handler->eventhandler = get_default_event_handler();
     handler->sh.enqueue_connection = evt_enq_conn;
     handler->sh.keep_alive = evt_keep_alive;