44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
commit afe8839f011c8c54c429f33ca0e6515fceb4e0fd
|
|
Author: Daniel P. Berrange <berrange@redhat.com>
|
|
Date: Fri Jul 8 12:41:06 2011 +0100
|
|
|
|
Fix leak of remote driver if final 'CLOSE' RPC call fails
|
|
|
|
When closing a remote connection we issue a (fairly pointless)
|
|
'CLOSE' RPC call to the daemon. If this fails we skip all the
|
|
cleanup of private data, but the virConnectPtr object still
|
|
gets released as normal. This causes a memory leak. Since the
|
|
CLOSE RPC call is pretty pointless, just carry on freeing the
|
|
remote driver if it fails.
|
|
|
|
* src/remote/remote_driver.c: Ignore failure to issue CLOSE
|
|
RPC call
|
|
|
|
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
|
|
index 199d8f8..8dff6a8 100644
|
|
--- a/src/remote/remote_driver.c
|
|
+++ b/src/remote/remote_driver.c
|
|
@@ -824,10 +824,12 @@ get_transport_from_scheme (char *scheme)
|
|
static int
|
|
doRemoteClose (virConnectPtr conn, struct private_data *priv)
|
|
{
|
|
+ int ret = 0;
|
|
+
|
|
if (call (conn, priv, 0, REMOTE_PROC_CLOSE,
|
|
(xdrproc_t) xdr_void, (char *) NULL,
|
|
(xdrproc_t) xdr_void, (char *) NULL) == -1)
|
|
- return -1;
|
|
+ ret = -1;
|
|
|
|
virNetTLSContextFree(priv->tls);
|
|
priv->tls = NULL;
|
|
@@ -846,7 +848,7 @@ doRemoteClose (virConnectPtr conn, struct private_data *priv)
|
|
virDomainEventStateFree(priv->domainEventState);
|
|
priv->domainEventState = NULL;
|
|
|
|
- return 0;
|
|
+ return ret;
|
|
}
|
|
|
|
static int
|