summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libglusterfs/src/client_t.c6
-rw-r--r--xlators/protocol/server/src/server-handshake.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/libglusterfs/src/client_t.c b/libglusterfs/src/client_t.c
index 4f51de9..1c29151 100644
--- a/libglusterfs/src/client_t.c
+++ b/libglusterfs/src/client_t.c
@@ -288,6 +288,9 @@ gf_client_put (client_t *client, gf_boolean_t *detached)
gf_boolean_t unref = _gf_false;
int bind_ref;
+ if (client == NULL)
+ goto out;
+
if (detached)
*detached = _gf_false;
@@ -304,6 +307,9 @@ gf_client_put (client_t *client, gf_boolean_t *detached)
*detached = _gf_true;
gf_client_unref (client);
}
+
+out:
+ return;
}
client_t *
diff --git a/xlators/protocol/server/src/server-handshake.c b/xlators/protocol/server/src/server-handshake.c
index 7ee12c4..40cc684 100644
--- a/xlators/protocol/server/src/server-handshake.c
+++ b/xlators/protocol/server/src/server-handshake.c
@@ -700,7 +700,7 @@ fail:
* list of connections the server is maintaining and might segfault
* during statedump when bound_xl of the connection is accessed.
*/
- if (op_ret && !xl) {
+ if (op_ret && !xl && (client != NULL)) {
/* We would have set the xl_private of the transport to the
* @conn. But if we have put the connection i.e shutting down
* the connection, then we should set xl_private to NULL as it