summaryrefslogtreecommitdiffstats
path: root/xlators/protocol/server/src/server-handshake.c
diff options
context:
space:
mode:
authorRaghavendra G <raghavendra@gluster.com>2010-09-15 00:27:10 +0000
committerVijay Bellur <vijay@dev.gluster.com>2010-09-15 00:06:37 -0700
commitabf28c8fd12f662f32c1a81f84620f562de8f14b (patch)
treee3d91d68aa1795535b6b7899cb9b31bfc6b2eb4d /xlators/protocol/server/src/server-handshake.c
parentcfbbf68f8af83521b41b40c07db48897b976b626 (diff)
memory leak fixes.
- free memory allocated by libc when decoding request arguments in server and reply in client. - free memory allocated to saved_frames during connection cleanup. - free memory allocated for transport name while creating listeners. Signed-off-by: Raghavendra G <raghavendra@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 1438 (memory leaks) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1438
Diffstat (limited to 'xlators/protocol/server/src/server-handshake.c')
-rw-r--r--xlators/protocol/server/src/server-handshake.c18
1 files changed, 17 insertions, 1 deletions
diff --git a/xlators/protocol/server/src/server-handshake.c b/xlators/protocol/server/src/server-handshake.c
index 98ec18cc2e9..b148f06690d 100644
--- a/xlators/protocol/server/src/server-handshake.c
+++ b/xlators/protocol/server/src/server-handshake.c
@@ -355,6 +355,7 @@ server_setvolume (rpcsvc_request_t *req)
int32_t op_errno = EINVAL;
int32_t fop_version = 0;
int32_t mgmt_version = 0;
+ char *buf = NULL;
params = dict_new ();
reply = dict_new ();
@@ -369,7 +370,15 @@ server_setvolume (rpcsvc_request_t *req)
config_params = dict_copy_with_ref (this->options, NULL);
conf = this->private;
- ret = dict_unserialize (args.dict.dict_val, args.dict.dict_len, &params);
+ buf = memdup (args.dict.dict_val, args.dict.dict_len);
+ if (buf == NULL) {
+ gf_log (this->name, GF_LOG_ERROR, "out of memory");
+ op_ret = -1;
+ op_errno = ENOMEM;
+ goto fail;
+ }
+
+ ret = dict_unserialize (buf, args.dict.dict_len, &params);
if (ret < 0) {
ret = dict_set_str (reply, "ERROR",
"Internal error: failed to unserialize "
@@ -385,6 +394,9 @@ server_setvolume (rpcsvc_request_t *req)
goto fail;
}
+ params->extra_free = buf;
+ buf = NULL;
+
ret = dict_get_str (params, "process-uuid", &process_uuid);
if (ret < 0) {
ret = dict_set_str (reply, "ERROR",
@@ -622,6 +634,10 @@ fail:
dict_unref (reply);
dict_unref (config_params);
+ if (buf) {
+ GF_FREE (buf);
+ }
+
return 0;
}