|
 |
cb8e9e |
From ad97c25ea8678a486c464b76e23cf319f8119c43 Mon Sep 17 00:00:00 2001
|
|
|
cb8e9e |
From: Vijay Bellur <vbellur@redhat.com>
|
|
|
cb8e9e |
Date: Wed, 3 Jun 2015 23:43:55 +0530
|
|
|
cb8e9e |
Subject: [PATCH 33/57] features/marker: Cleanup loc in case of errors
|
|
|
cb8e9e |
|
|
|
cb8e9e |
This is a backport of http://review.gluster.org/#/c/11074/
|
|
|
cb8e9e |
|
|
|
cb8e9e |
> Missing loc_wipe() for error paths in mq_readdir_cbk() can
|
|
|
cb8e9e |
> cause memory leaks. loc_wipe() is now done for both happy
|
|
|
cb8e9e |
> and unhappy paths.
|
|
|
cb8e9e |
>
|
|
|
cb8e9e |
> Change-Id: I882aa5dcca06e25b56a828767fb2b91a1efaf83b
|
|
|
cb8e9e |
> BUG: 1227904
|
|
|
cb8e9e |
> Signed-off-by: Vijay Bellur <vbellur@redhat.com>
|
|
|
cb8e9e |
> Reviewed-on: http://review.gluster.org/11074
|
|
|
cb8e9e |
> Reviewed-by: Sachin Pandit <spandit@redhat.com>
|
|
|
cb8e9e |
> Tested-by: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
cb8e9e |
> Tested-by: Gluster Build System <jenkins@build.gluster.com>
|
|
|
cb8e9e |
> Reviewed-by: Vijaikumar Mallikarjuna <vmallika@redhat.com>
|
|
|
cb8e9e |
> Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
|
|
|
cb8e9e |
> Tested-by: Raghavendra G <rgowdapp@redhat.com>
|
|
|
cb8e9e |
|
|
|
cb8e9e |
Change-Id: I9da333b701eaace7f492280386e7ded4459f442f
|
|
|
cb8e9e |
BUG: 1229612
|
|
|
cb8e9e |
Signed-off-by: vmallika <vmallika@redhat.com>
|
|
|
cb8e9e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/50309
|
|
|
cb8e9e |
Reviewed-by: Raghavendra Gowdappa <rgowdapp@redhat.com>
|
|
|
cb8e9e |
Tested-by: Raghavendra Gowdappa <rgowdapp@redhat.com>
|
|
|
cb8e9e |
---
|
|
|
cb8e9e |
xlators/features/marker/src/marker-quota.c | 4 +---
|
|
|
cb8e9e |
1 files changed, 1 insertions(+), 3 deletions(-)
|
|
|
cb8e9e |
|
|
|
cb8e9e |
diff --git a/xlators/features/marker/src/marker-quota.c b/xlators/features/marker/src/marker-quota.c
|
|
|
cb8e9e |
index e9351ed..ef70236 100644
|
|
|
cb8e9e |
--- a/xlators/features/marker/src/marker-quota.c
|
|
|
cb8e9e |
+++ b/xlators/features/marker/src/marker-quota.c
|
|
|
cb8e9e |
@@ -665,12 +665,10 @@ mq_readdir_cbk (call_frame_t *frame,
|
|
|
cb8e9e |
&loc, dict);
|
|
|
cb8e9e |
|
|
|
cb8e9e |
offset = entry->d_off;
|
|
|
cb8e9e |
-
|
|
|
cb8e9e |
- loc_wipe (&loc;;
|
|
|
cb8e9e |
-
|
|
|
cb8e9e |
newframe = NULL;
|
|
|
cb8e9e |
|
|
|
cb8e9e |
out:
|
|
|
cb8e9e |
+ loc_wipe (&loc;;
|
|
|
cb8e9e |
if (dict) {
|
|
|
cb8e9e |
dict_unref (dict);
|
|
|
cb8e9e |
dict = NULL;
|
|
|
cb8e9e |
--
|
|
|
cb8e9e |
1.7.1
|
|
|
cb8e9e |
|