summaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
authorAmar Tumballi <amar@gluster.com>2010-09-13 08:32:37 +0000
committerVijay Bellur <vijay@dev.gluster.com>2010-09-13 07:23:39 -0700
commit174f963c846331c6dafda169451790b6039ef3fb (patch)
tree18bd105b5a354d9d106a686a10a055ce07f7b2b4 /rpc
parent39e268ee69618488616df1c253b851c07442c863 (diff)
rpc: in rpc_clnt_destroy(), cleanup the transport too
* if we don't cleanup the transport, it will trigger false events on the free'd transport which causes crash Signed-off-by: Amar Tumballi <amar@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 1423 (Crash in gf_timer_call_cancel) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1423
Diffstat (limited to 'rpc')
-rw-r--r--rpc/rpc-lib/src/rpc-clnt.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/rpc/rpc-lib/src/rpc-clnt.c b/rpc/rpc-lib/src/rpc-clnt.c
index 52316a0..4b01a3c 100644
--- a/rpc/rpc-lib/src/rpc-clnt.c
+++ b/rpc/rpc-lib/src/rpc-clnt.c
@@ -798,6 +798,8 @@ rpc_clnt_notify (rpc_transport_t *trans, void *mydata,
goto out;
}
clnt = conn->rpc_clnt;
+ if (!clnt)
+ goto out;
switch (event) {
case RPC_TRANSPORT_DISCONNECT:
@@ -1386,6 +1388,10 @@ out:
void
rpc_clnt_destroy (struct rpc_clnt *rpc)
{
+ if (!rpc)
+ return;
+
+ rpc_transport_destroy (rpc->conn.trans);
rpc_clnt_connection_cleanup (&rpc->conn);
rpc_clnt_reconnect_cleanup (&rpc->conn);
pthread_mutex_destroy (&rpc->lock);