From: SATOH Fumiyasu <fumiyas@osstech.co.jp>
Date: Wed, 10 Mar 2010 03:15:44 +0000 (+0900)
Subject: vfs_netatalk: Segfault if hide files or veto files has no ".AppleDouble"
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12dc7210fdba44d4df87102d44ee1bb7fc51f9f3;p=thirdparty%2Fsamba.git

vfs_netatalk: Segfault if hide files or veto files has no ".AppleDouble"

Fix bug #1206 (netatalk vfs causes segfaults in samba).
(cherry picked from commit 531a9ebd52fe65196bb01632a296b40a92a43b4c)
---

diff --git a/source3/modules/vfs_netatalk.c b/source3/modules/vfs_netatalk.c
index e2fa0fb88a8..885a972ac32 100644
--- a/source3/modules/vfs_netatalk.c
+++ b/source3/modules/vfs_netatalk.c
@@ -125,7 +125,7 @@ static void atalk_add_to_list(name_compare_entry **list)
 		}
 	}
 
-	if (!(new_list = SMB_CALLOC_ARRAY(name_compare_entry, (count == 0 ? 1 : count + 1))))
+	if (!(new_list = SMB_CALLOC_ARRAY(name_compare_entry, count + 2)))
 		return;
 
 	for (i = 0; i < count; i ++) {