From cba2f84cd084fdf005977690dce3c54fa9f8b133 Mon Sep 17 00:00:00 2001 From: Rajesh Amaravathi Date: Fri, 16 Mar 2012 16:59:45 +0530 Subject: rpc-lib: memleak fix in rpcsvc_volume_allowed Change-Id: Iaa6baa4a3e036b2b5c808ea5e79017fffeb80a24 BUG: 801754 Signed-off-by: Rajesh Amaravathi Reviewed-on: http://review.gluster.com/2956 Tested-by: Gluster Build System Reviewed-by: Jeff Darcy Reviewed-by: Anand Avati --- rpc/rpc-lib/src/rpcsvc.c | 11 ++++++----- xlators/cluster/dht/src/dht-common.c | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/rpc/rpc-lib/src/rpcsvc.c b/rpc/rpc-lib/src/rpcsvc.c index 398bcdab8..515ec6727 100644 --- a/rpc/rpc-lib/src/rpcsvc.c +++ b/rpc/rpc-lib/src/rpcsvc.c @@ -2403,14 +2403,15 @@ rpcsvc_volume_allowed (dict_t *options, char *volname) goto out; } - if (!dict_get (options, srchstr)) { - GF_FREE (srchstr); - srchstr = globalrule; - ret = dict_get_str (options, srchstr, &addrstr); - } else + if (!dict_get (options, srchstr)) + ret = dict_get_str (options, globalrule, &addrstr); + else ret = dict_get_str (options, srchstr, &addrstr); out: + if (srchstr) + GF_FREE (srchstr); + return addrstr; } diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c index 2bff9c87b..059246d97 100644 --- a/xlators/cluster/dht/src/dht-common.c +++ b/xlators/cluster/dht/src/dht-common.c @@ -3776,7 +3776,7 @@ err: } -int + int dht_mkdir (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode, dict_t *params) { -- cgit