From: Timo Sirainen <tss@iki.fi>
Date: Wed, 18 Nov 2015 12:15:32 +0000 (+0200)
Subject: lib-master: Fixed timeout leak at deinit when we couldn't connect to ipc-server
X-Git-Tag: 2.2.20.rc1~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce4d4d77309a7ca28006fc0539effe2ccc8e7908;p=thirdparty%2Fdovecot%2Fcore.git

lib-master: Fixed timeout leak at deinit when we couldn't connect to ipc-server
---

diff --git a/src/lib-master/ipc-server.c b/src/lib-master/ipc-server.c
index af1bd0b1b6..0723c14644 100644
--- a/src/lib-master/ipc-server.c
+++ b/src/lib-master/ipc-server.c
@@ -154,6 +154,8 @@ void ipc_server_deinit(struct ipc_server **_server)
 	i_assert(server->ipc_cmd_refcount == 0);
 
 	ipc_server_disconnect(server);
+	if (server->to != NULL)
+		timeout_remove(&server->to);
 	i_free(server->name);
 	i_free(server->path);
 	i_free(server);