diff options
| author | Xavier Hernandez <xhernandez@datalab.es> | 2017-09-12 14:53:41 +0200 |
|---|---|---|
| committer | jiffin tony Thottan <jthottan@redhat.com> | 2017-10-10 05:35:06 +0000 |
| commit | a4fea86c5203838422f5e3bc4c764a0c655392ee (patch) | |
| tree | a7cf180754ac4054466e2bb1b78de9c06fa4c0f5 | |
| parent | f73814ad08d552d94d0139b2592175d206e7a166 (diff) | |
glusterd: fix invalid memory reference returned
> BUG: 1490897
> Reviewed-on: https://review.gluster.org/18263
> Smoke: Gluster Build System <jenkins@build.gluster.org>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
> Reviewed-by: Jeff Darcy <jeff@pl.atyp.us>
> Reviewed-by: Gaurav Yadav <gyadav@redhat.com>
Change-Id: I0823c7b33060b48040c1d86ad346a5f6e15bc190
BUG: 1491178
Signed-off-by: Xavier Hernandez <xhernandez@datalab.es>
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-handshake.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handshake.c b/xlators/mgmt/glusterd/src/glusterd-handshake.c index 214dc6abd98..c7e419c5691 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handshake.c +++ b/xlators/mgmt/glusterd/src/glusterd-handshake.c @@ -441,6 +441,7 @@ glusterd_get_args_from_dict (gf_getspec_req *args, peer_info_t *peerinfo, int client_min_op_version = 1; int32_t ret = -1; xlator_t *this = NULL; + char *name = NULL; this = THIS; GF_ASSERT (this); @@ -485,14 +486,18 @@ glusterd_get_args_from_dict (gf_getspec_req *args, peer_info_t *peerinfo, goto out; } - ret = dict_get_str (dict, "brick_name", - brick_name); + ret = dict_get_str (dict, "brick_name", &name); if (ret) { gf_msg_debug (this->name, 0, "No brick name present"); ret = 0; goto out; } + *brick_name = gf_strdup(name); + if (*brick_name == NULL) { + ret = -1; + goto out; + } gf_msg_debug (this->name, 0, "brick_name = %s", *brick_name); out: @@ -943,6 +948,8 @@ fail: if (spec_fd > 0) sys_close (spec_fd); + GF_FREE(brick_name); + rsp.op_ret = ret; if (op_errno) |