From 3c5aed7d8226e50296c6a7106e0d59682732e9b5 Mon Sep 17 00:00:00 2001 From: Raghavendra Bhat Date: Tue, 3 Apr 2012 15:22:45 +0530 Subject: locks, stripe: check if dict is NULL before refing it Change-Id: Ifab58504280ed92e4435f7805052745e56bef5ef BUG: 808003 Signed-off-by: Raghavendra Bhat Reviewed-on: http://review.gluster.com/3073 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- xlators/cluster/stripe/src/stripe.c | 9 ++++++--- xlators/features/locks/src/posix.c | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'xlators') diff --git a/xlators/cluster/stripe/src/stripe.c b/xlators/cluster/stripe/src/stripe.c index 73700ff925e..44a00ee1216 100644 --- a/xlators/cluster/stripe/src/stripe.c +++ b/xlators/cluster/stripe/src/stripe.c @@ -225,7 +225,8 @@ stripe_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this, local->stbuf = *buf; local->postparent = *postparent; local->inode = inode_ref (inode); - local->xdata = dict_ref (xdata); + if (xdata) + local->xdata = dict_ref (xdata); if (local->xattr) { stripe_aggregate_xattr (local->xdata, local->xattr); @@ -1848,7 +1849,8 @@ stripe_mkdir (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode, } local->op_ret = -1; local->call_count = priv->child_count; - local->xdata = dict_ref (xdata); + if (xdata) + local->xdata = dict_ref (xdata); local->mode = mode; local->umask = umask; loc_copy (&local->loc, loc); @@ -2297,7 +2299,8 @@ stripe_create (call_frame_t *frame, xlator_t *this, loc_t *loc, local->flags = flags; local->mode = mode; local->umask = umask; - local->xattr = dict_ref (xdata); + if (xdata) + local->xattr = dict_ref (xdata); local->call_count = priv->child_count; /* Send a setxattr request to nodes where the diff --git a/xlators/features/locks/src/posix.c b/xlators/features/locks/src/posix.c index 15b68fac7fd..3e04c18f008 100644 --- a/xlators/features/locks/src/posix.c +++ b/xlators/features/locks/src/posix.c @@ -272,7 +272,8 @@ pl_ftruncate (call_frame_t *frame, xlator_t *this, local->op = FTRUNCATE; local->offset = offset; local->fd = fd_ref (fd); - local->xdata = dict_ref (xdata); + if (xdata) + local->xdata = dict_ref (xdata); frame->local = local; -- cgit