From c20b6d238d2ab997736af53237d48200226b8c08 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Wed, 19 Aug 2009 17:56:47 +0400 Subject: [PATCH] * Fix descriptors leakage in controller --- src/controller.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/controller.c b/src/controller.c index 30daa26fc..d7917508a 100644 --- a/src/controller.c +++ b/src/controller.c @@ -141,6 +141,8 @@ free_session (struct controller_session *session, gboolean is_soft) rspamd_remove_dispatcher (session->dispatcher); } + close (session->sock); + memory_pool_delete (session->session_pool); g_free (session); } @@ -524,9 +526,7 @@ controller_write_socket (void *arg) struct controller_session *session = (struct controller_session *)arg; if (session->state == STATE_QUIT) { - msg_info ("closing control connection"); /* Free buffers */ - close (session->sock); free_session (session, TRUE); return; } @@ -541,10 +541,7 @@ controller_err_socket (GError *err, void *arg) { struct controller_session *session = (struct controller_session *)arg; - if (err->code == EOF) { - msg_info ("controller_err_socket: client closed control connection"); - } - else { + if (err->code != EOF) { msg_info ("controller_err_socket: abnormally closing control connection, error: %s", err->message); } /* Free buffers */ -- 2.39.5