summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKotresh HR <khiremat@redhat.com>2014-10-31 07:06:52 +0530
committerKrishnan Parthasarathi <kparthas@redhat.com>2014-11-02 20:55:55 -0800
commitadfccb57565ff1af0bbb79efc3cf489c55509aba (patch)
tree403cfc78ceeb48aeaaa372451536d289f1ddea83
parent12bc39c144aa41a097435f2aab304ddfbbb9b625 (diff)
glusterd/geo-rep: Fix glusterd crash in non-originator slave node.
Problem: glusterd crashes in non-originator slave node during geo-rep create push-pem. Cause: In glusterd_op_copy_file, the value of the key "common_pem_contents" is freed explicitly even after dict_set is successful when it is taken cared by dict_free. Solution: Free only in failure cases before dict_set. Change-Id: I65b5f32ee2b946107ad279b1fe3d728ec699bc7e BUG: 1159119 Signed-off-by: Kotresh HR <khiremat@redhat.com> Reviewed-on: http://review.gluster.org/9018 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Poornima G <pgurusid@redhat.com> Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com> Tested-by: Krishnan Parthasarathi <kparthas@redhat.com>
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-geo-rep.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c
index 8496327443c..a88729c0e6a 100644
--- a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c
+++ b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c
@@ -4383,6 +4383,7 @@ glusterd_op_copy_file (dict_t *dict, char **op_errstr)
}
free_contents = _gf_false;
} else {
+ free_contents = _gf_false;
ret = dict_get_bin (dict, "common_pem_contents",
(void **) &contents);
if (ret) {