From cba2f84cd084fdf005977690dce3c54fa9f8b133 Mon Sep 17 00:00:00 2001
From: Rajesh Amaravathi <rajesh@redhat.com>
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 <rajesh@redhat.com>
Reviewed-on: http://review.gluster.com/2956
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Reviewed-by: Anand Avati <avati@redhat.com>
---
 rpc/rpc-lib/src/rpcsvc.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'rpc')

diff --git a/rpc/rpc-lib/src/rpcsvc.c b/rpc/rpc-lib/src/rpcsvc.c
index 398bcdab805..515ec672732 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;
 }
 
-- 
cgit