summaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2012-06-05 21:59:47 -0400
committerAnand Avati <avati@redhat.com>2012-06-05 22:26:26 -0700
commitbe1d2cd4d042bda2e53e3c45dd36e8ed9525ba32 (patch)
treeb4c15bc9e7d9bd9def09fce2ec46943cff62683e /rpc
parenta7370dc95ec2a875c937c682e6f0c8aa31c91b4a (diff)
rpc: avoid an invalid free of item on a list
If we actually "consumed" vol_opt by putting it on THIS->volume_options, it's still in use and we shouldn't free it before returning. Change-Id: I8ef3e4ce8a8b9f2552faa3345f1686e173d1aa10 BUG: 829104 Signed-off-by: Jeff Darcy <jdarcy@redhat.com> Reviewed-on: http://review.gluster.com/3528 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Amar Tumballi <amarts@redhat.com> Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'rpc')
-rw-r--r--rpc/rpc-lib/src/rpc-transport.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/rpc/rpc-lib/src/rpc-transport.c b/rpc/rpc-lib/src/rpc-transport.c
index d0e7834..4b69374 100644
--- a/rpc/rpc-lib/src/rpc-transport.c
+++ b/rpc/rpc-lib/src/rpc-transport.c
@@ -305,6 +305,7 @@ rpc_transport_load (glusterfs_ctx_t *ctx, dict_t *options, char *trans_name)
"volume option validation failed");
goto fail;
}
+ vol_opt = NULL;
}
trans->options = options;