From: Volker Lendecke Date: Sun, 10 Apr 2016 10:51:15 +0000 (+0200) Subject: vfs_catia: Fix bug 11827, memleak X-Git-Tag: samba-4.2.12~43 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75f26e36f159035def45cc1aea178388279e6bfc;p=thirdparty%2Fsamba.git vfs_catia: Fix bug 11827, memleak add_srt should add the mappings to the linked list even if mappings==NULL (the default) Bug: https://bugzilla.samba.org/show_bug.cgi?id=11827 Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme Autobuild-User(master): Ralph Böhme Autobuild-Date(master): Mon Apr 11 14:25:59 CEST 2016 on sn-devel-144 (cherry picked from commit 3e2af1568d150de1cb12fef40580f4880ac787ff) Autobuild-User(v4-2-test): Karolin Seeger Autobuild-Date(v4-2-test): Mon Apr 18 15:44:50 CEST 2016 on sn-devel-104 --- diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c index ff11a9a8d0d..b6e6cab509f 100644 --- a/source3/modules/vfs_catia.c +++ b/source3/modules/vfs_catia.c @@ -141,6 +141,9 @@ static struct share_mapping_entry *add_srt(int snum, const char **mappings) ret->snum = snum; + ret->next = srt_head; + srt_head = ret; + if (mappings) { ret->mappings = (struct char_mappings**) ((unsigned char*) ret + sizeof(struct share_mapping_entry)); @@ -176,9 +179,6 @@ static struct share_mapping_entry *add_srt(int snum, const char **mappings) } } - ret->next = srt_head; - srt_head = ret; - return ret; }