The branch, master has been updated via 06281e8 vfs_glusterfs: Fix a memory leak in connect path from 945e55c s3-selftest: Add a substituions testcase
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 06281e8f1b912540a8cc2a79497b074dbe559d53 Author: Anoop C S <anoo...@redhat.com> Date: Fri Oct 7 16:05:29 2016 +0530 vfs_glusterfs: Fix a memory leak in connect path Early return in case of failure to set snapdir-entry-path xlator option leaks talloced tmp_ctx. Signed-off-by: Anoop C S <anoo...@redhat.com> Reviewed-by: Guenther Deschner <g...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> Autobuild-User(master): Günther Deschner <g...@samba.org> Autobuild-Date(master): Fri Oct 7 19:39:11 CEST 2016 on sn-devel-144 ----------------------------------------------------------------------- Summary of changes: source3/modules/vfs_glusterfs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c index a467235..732ca51 100644 --- a/source3/modules/vfs_glusterfs.c +++ b/source3/modules/vfs_glusterfs.c @@ -224,8 +224,7 @@ static int vfs_gluster_connect(struct vfs_handle_struct *handle, if (ret < 0) { DEBUG(0, ("%s: Failed to set xlator option:" " snapdir-entry-path\n", volume)); - glfs_fini(fs); - return -1; + goto done; } ret = glfs_set_logging(fs, logfile, loglevel); -- Samba Shared Repository