summaryrefslogtreecommitdiffstats
path: root/xlators/features/marker
diff options
context:
space:
mode:
authorVijay Bellur <vbellur@redhat.com>2015-06-03 23:43:55 +0530
committerVijay Bellur <vbellur@redhat.com>2015-06-29 10:29:51 -0700
commit7d22aa386d0ef30689da86e71e5390b3066192e1 (patch)
treeb4bd9651c8ce29c8cff45c8ac4d73b93660c2555 /xlators/features/marker
parentf6385aeb2f69b36fd02498259258f013582f706f (diff)
features/marker: Cleanup loc in case of errors
Backport of http://review.gluster.org/11074 Missing loc_wipe() for error paths in mq_readdir_cbk() can cause memory leaks. loc_wipe() is now done for both happy and unhappy paths. Change-Id: I882aa5dcca06e25b56a828767fb2b91a1efaf83b BUG: 1228535 Signed-off-by: Vijay Bellur <vbellur@redhat.com> Reviewed-on: http://review.gluster.org/11098 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com>
Diffstat (limited to 'xlators/features/marker')
-rw-r--r--xlators/features/marker/src/marker-quota.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/xlators/features/marker/src/marker-quota.c b/xlators/features/marker/src/marker-quota.c
index 411d21d..bbe2d9d 100644
--- a/xlators/features/marker/src/marker-quota.c
+++ b/xlators/features/marker/src/marker-quota.c
@@ -665,12 +665,10 @@ mq_readdir_cbk (call_frame_t *frame,
&loc, dict);
offset = entry->d_off;
-
- loc_wipe (&loc);
-
newframe = NULL;
out:
+ loc_wipe (&loc);
if (dict) {
dict_unref (dict);
dict = NULL;