From 9a3f1f2d4348e50919cd2cbb109ef1c7f7372c43 Mon Sep 17 00:00:00 2001
From: Vijay Bellur <vbellur@redhat.com>
Date: Tue, 4 Oct 2016 13:55:53 -0400
Subject: [PATCH 633/642] mgmt/glusterd: Cleanup memory leaks in handshake
Thanks to bingxuan.zhang at nokia dot com for the report and patch.
> Change-Id: I994f82493fec7827f31592340af5bda83322f878
> BUG: 1377584
> Signed-off-by: Vijay Bellur <vbellur@redhat.com>
> Reviewed-on: http://review.gluster.org/15612
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
> Smoke: Gluster Build System <jenkins@build.gluster.org>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
> Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
> (cherry pick from commit f0c588e5e6fa1552325a31e0e01704ecf063c7e1)
BUG: 1526363
Change-Id: I994f82493fec7827f31592340af5bda83322f878
Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/125953
Tested-by: RHGS Build Bot <nigelb@redhat.com>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
---
xlators/mgmt/glusterd/src/glusterd-handshake.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/xlators/mgmt/glusterd/src/glusterd-handshake.c b/xlators/mgmt/glusterd/src/glusterd-handshake.c
index a09437e..652c868 100644
--- a/xlators/mgmt/glusterd/src/glusterd-handshake.c
+++ b/xlators/mgmt/glusterd/src/glusterd-handshake.c
@@ -476,6 +476,10 @@ out:
peerinfo->max_op_version = client_max_op_version;
peerinfo->min_op_version = client_min_op_version;
+ if (dict)
+ dict_unref (dict);
+
+
return ret;
}
@@ -930,6 +934,8 @@ fail:
(xdrproc_t)xdr_gf_getspec_rsp);
free (args.key);//malloced by xdr
free (rsp.spec);
+ if (args.xdata.xdata_val)
+ free (args.xdata.xdata_val);
return 0;
}
--
2.9.3