From 1562b5af8c8a10e3f2c08b8f16c6db01d3b9f28c Mon Sep 17 00:00:00 2001
From: Anuradha <atalur@redhat.com>
Date: Tue, 12 May 2015 12:53:30 +0530
Subject: cluster/afr : Do not copy dict when it is NULL

       Backport of: http://review.gluster.org/10755

In afr_lookup_xattr_req_prepare(), dict_copy was
done even though source dict was NULL.

Change-Id: I85a5d2823ba021e7f78c1ce13402a0f16b08cb51
BUG: 1221470
Reviewed-on: http://review.gluster.org/10755
Reviewed-by: Ravishankar N <ravishankar@redhat.com>
Reviewed-by: Prashanth Pai <ppai@redhat.com>
Reviewed-by: Krutika Dhananjay <kdhananj@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Susant Palai <spalai@redhat.com>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Signed-off-by: Anuradha <atalur@redhat.com>
Reviewed-on: http://review.gluster.org/10777
---
 xlators/cluster/afr/src/afr-common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'xlators/cluster')

diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c
index 46f726da734..690c7c8c15d 100644
--- a/xlators/cluster/afr/src/afr-common.c
+++ b/xlators/cluster/afr/src/afr-common.c
@@ -951,7 +951,7 @@ afr_lookup_xattr_req_prepare (afr_local_t *local, xlator_t *this,
         if (!local->xattr_req)
                 goto out;
 
-        if (xattr_req != local->xattr_req)
+        if (xattr_req && (xattr_req != local->xattr_req))
                 dict_copy (xattr_req, local->xattr_req);
 
         ret = afr_xattr_req_prepare (this, local->xattr_req);
-- 
cgit