summaryrefslogtreecommitdiffstats
path: root/xlators/protocol/server/src/server3_1-fops.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/server3_1-fops.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/server3_1-fops.c')
-rw-r--r--xlators/protocol/server/src/server3_1-fops.c49
1 files changed, 47 insertions, 2 deletions
diff --git a/xlators/protocol/server/src/server3_1-fops.c b/xlators/protocol/server/src/server3_1-fops.c
index 5be5047..1ced00a 100644
--- a/xlators/protocol/server/src/server3_1-fops.c
+++ b/xlators/protocol/server/src/server3_1-fops.c
@@ -2904,6 +2904,12 @@ server_create (rpcsvc_request_t *req)
memcpy (state->resolve.pargfid, args.pargfid, 16);
resolve_and_resume (frame, server_create_resume);
+
+ /* memory allocated by libc, don't use GF_FREE */
+ if (args.dict.dict_val != NULL) {
+ free (args.dict.dict_val);
+ }
+
return 0;
out:
if (params)
@@ -2912,8 +2918,13 @@ out:
if (buf) {
GF_FREE (buf);
}
- return 0;
+ /* memory allocated by libc, don't use GF_FREE */
+ if (args.dict.dict_val != NULL) {
+ free (args.dict.dict_val);
+ }
+
+ return 0;
}
@@ -4109,6 +4120,12 @@ server_mknod (rpcsvc_request_t *req)
state->dev = args.dev;
resolve_and_resume (frame, server_mknod_resume);
+
+ /* memory allocated by libc, don't use GF_FREE */
+ if (args.dict.dict_val != NULL) {
+ free (args.dict.dict_val);
+ }
+
return 0;
out:
if (params)
@@ -4117,6 +4134,12 @@ out:
if (buf) {
GF_FREE (buf);
}
+
+ /* memory allocated by libc, don't use GF_FREE */
+ if (args.dict.dict_val != NULL) {
+ free (args.dict.dict_val);
+ }
+
return 0;
}
@@ -4197,6 +4220,12 @@ server_mkdir (rpcsvc_request_t *req)
state->mode = args.mode;
resolve_and_resume (frame, server_mkdir_resume);
+
+ if (args.dict.dict_val != NULL) {
+ /* memory allocated by libc, don't use GF_FREE */
+ free (args.dict.dict_val);
+ }
+
return 0;
out:
if (params)
@@ -4205,8 +4234,13 @@ out:
if (buf) {
GF_FREE (buf);
}
- return 0;
+ if (args.dict.dict_val != NULL) {
+ /* memory allocated by libc, don't use GF_FREE */
+ free (args.dict.dict_val);
+ }
+
+ return 0;
}
@@ -4631,6 +4665,11 @@ server_symlink (rpcsvc_request_t *req)
state->name = gf_strdup (args.linkname);
resolve_and_resume (frame, server_symlink_resume);
+
+ /* memory allocated by libc, don't use GF_FREE */
+ if (args.dict.dict_val != NULL) {
+ free (args.dict.dict_val);
+ }
return 0;
out:
if (params)
@@ -4639,6 +4678,12 @@ out:
if (buf) {
GF_FREE (buf);
}
+
+ /* memory allocated by libc, don't use GF_FREE */
+ if (args.dict.dict_val != NULL) {
+ free (args.dict.dict_val);
+ }
+
return 0;
}