From 8cd30687d3ffbc29838956305ea8716bb9719acb Mon Sep 17 00:00:00 2001 From: Avra Sengupta Date: Thu, 22 May 2014 14:31:13 +0000 Subject: glusterd/vol_locks: Dereference ctx->dict, only if ctx != NULL Change-Id: I7f753aff197fe08fad255fc75d7f88d2a4632de8 BUG: 1100325 Signed-off-by: Avra Sengupta Reviewed-on: http://review.gluster.org/7849 Reviewed-by: Atin Mukherjee Reviewed-by: Sachin Pandit Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- xlators/mgmt/glusterd/src/glusterd-mgmt-handler.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xlators/mgmt/glusterd/src/glusterd-mgmt-handler.c b/xlators/mgmt/glusterd/src/glusterd-mgmt-handler.c index 83325f75845..48e390f5692 100644 --- a/xlators/mgmt/glusterd/src/glusterd-mgmt-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-mgmt-handler.c @@ -190,11 +190,11 @@ glusterd_handle_mgmt_v3_lock_fn (rpcsvc_request_t *req) out: - if (ret || free_ctx) { + if (ctx && (ret || free_ctx)) { if (ctx->dict) dict_unref (ctx->dict); - if (ctx) - GF_FREE (ctx); + + GF_FREE (ctx); } free (lock_req.dict.dict_val); @@ -861,11 +861,11 @@ glusterd_handle_mgmt_v3_unlock_fn (rpcsvc_request_t *req) out: - if (ret || free_ctx) { + if (ctx && (ret || free_ctx)) { if (ctx->dict) dict_unref (ctx->dict); - if (ctx) - GF_FREE (ctx); + + GF_FREE (ctx); } free (lock_req.dict.dict_val); -- cgit