From 09643c44a83dc0bba80286b3a7b460e419d3d79a Mon Sep 17 00:00:00 2001
From: Raghavendra G <rgowdapp@redhat.com>
Date: Mon, 6 Jul 2015 15:45:45 +0530
Subject: [PATCH 207/212] protocol/server: Add null check to gf_client_put

Change-Id: I8bab3cd7387f89743e15e7569f0bc83a7df3c754
BUG: 1239280
Signed-off-by: Raghavendra G <rgowdapp@redhat.com>
Reviewed-on: http://review.gluster.org/11550
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/52470
---
 libglusterfs/src/client_t.c                    |    6 ++++++
 xlators/protocol/server/src/server-handshake.c |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/libglusterfs/src/client_t.c b/libglusterfs/src/client_t.c
index 035658f..c6997c0 100644
--- a/libglusterfs/src/client_t.c
+++ b/libglusterfs/src/client_t.c
@@ -293,6 +293,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;
 
@@ -309,6 +312,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 4aaa933..89e0c1a 100644
--- a/xlators/protocol/server/src/server-handshake.c
+++ b/xlators/protocol/server/src/server-handshake.c
@@ -705,7 +705,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
-- 
1.7.1