2 files changed, 8 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c
index 439facef0b9..58d58f625d0 100644
--- a/xlators/mgmt/glusterd/src/glusterd-handler.c
+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c
@@ -1722,12 +1722,17 @@ glusterd_handle_set_volume (rpcsvc_request_t *req)
                                 "failed to "
                                 "unserialize req-buffer to dictionary");
                         goto out;
+                } else {
+                        dict->extra_stdfree = cli_req.dict.dict_val;
                 }
         }
 
         ret = glusterd_set_volume (req, dict);
 
 out:
+        if (cli_req.volname)
+                free (cli_req.volname);//malloced by xdr
+
         return ret;
 }
 
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
index e3a9777c6c3..568bb50d85f 100644
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
@@ -1208,6 +1208,9 @@ glusterd_op_perform_remove_brick (glusterd_volinfo_t  *volinfo, char *brick)
         volinfo->brick_count--;
 
 out:
+        if (dup_brick)
+                GF_FREE (dup_brick);
+
         gf_log ("", GF_LOG_DEBUG, "Returning %d", ret);
         return ret;
 }