From 355d8f470f92f10587bb84709fddb706efdb4dee Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Thu, 18 Jun 2015 14:37:43 +0200 Subject: [PATCH] virNetServerServiceClose: Don't leak sockets Well, if a server is being destructed, all underlying services and their sockets should disappear with it. But due to bug in our implementation this is not the case. Yes, we are closing the sockets, but that's not enough. We must also: 1) Unregister them from the event loop 2) Unref the service for each socket The last step is needed, because each socket callback holds a reference to the service object. Since in the first step we are unregistering the callbacks, they no longer need the reference. Signed-off-by: Michal Privoznik --- src/rpc/virnetserverservice.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c index 4df26cb52f..3b35fc0929 100644 --- a/src/rpc/virnetserverservice.c +++ b/src/rpc/virnetserverservice.c @@ -520,6 +520,9 @@ void virNetServerServiceClose(virNetServerServicePtr svc) if (!svc) return; - for (i = 0; i < svc->nsocks; i++) + for (i = 0; i < svc->nsocks; i++) { + virNetSocketRemoveIOCallback(svc->socks[i]); virNetSocketClose(svc->socks[i]); + virObjectUnref(svc); + } } -- 2.47.2