diff options
| author | Ravishankar N <ravishankar@redhat.com> | 2014-09-08 21:52:30 +0530 |
|---|---|---|
| committer | Raghavendra G <rgowdapp@redhat.com> | 2014-09-09 03:12:15 -0700 |
| commit | 7d0a305e23a28631c7c3e8cfc648c9c9a24148f6 (patch) | |
| tree | 38d048175f8d1c1a2c63d65489f8cb086342d92f /xlators/features/marker | |
| parent | 822cf315a5d0f0d2bc90e9f2d8faa6e5e5701ed4 (diff) | |
quota/marker: Fix dict leaks
Unref dicts in quota and marker functions before they return.
Change-Id: I772edc7b46657a70fb136e037576c65e9beeaca8
BUG: 1139327
Signed-off-by: Ravishankar N <ravishankar@redhat.com>
Reviewed-on: http://review.gluster.org/8655
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Tested-by: Raghavendra G <rgowdapp@redhat.com>
Diffstat (limited to 'xlators/features/marker')
| -rw-r--r-- | xlators/features/marker/src/marker.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/xlators/features/marker/src/marker.c b/xlators/features/marker/src/marker.c index 465ee8c7ce6..b037844e855 100644 --- a/xlators/features/marker/src/marker.c +++ b/xlators/features/marker/src/marker.c @@ -250,7 +250,8 @@ marker_getxattr_stampfile_cbk (call_frame_t *frame, xlator_t *this, STACK_UNWIND_STRICT (getxattr, frame, 0, 0, dict, xdata); - dict_unref (dict); + if (dict) + dict_unref (dict); out: return 0; } @@ -2778,7 +2779,11 @@ marker_readdirp (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, priv = this->private; - if ((dict != NULL) && dict_get (dict, GET_ANCESTRY_DENTRY_KEY)) { + dict = dict ? dict_ref(dict) : dict_new(); + if (!dict) + goto unwind; + + if (dict_get (dict, GET_ANCESTRY_DENTRY_KEY)) { STACK_WIND (frame, marker_build_ancestry_cbk, FIRST_CHILD(this), FIRST_CHILD(this)->fops->readdirp, @@ -2791,9 +2796,6 @@ marker_readdirp (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, loc.parent = local->loc.inode = inode_ref (fd->inode); - if (dict == NULL) - dict = dict_new (); - mq_req_xattr (this, &loc, dict); } @@ -2803,10 +2805,13 @@ marker_readdirp (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, fd, size, offset, dict); } + dict_unref (dict); + return 0; +unwind: + STACK_UNWIND_STRICT (readdirp, frame, -1, ENOMEM, NULL, NULL); return 0; } - int32_t mem_acct_init (xlator_t *this) { |