vfs_netatalk: Segfault if hide files or veto files has no ".AppleDouble"
authorSATOH Fumiyasu <fumiyas@osstech.co.jp>
Wed, 10 Mar 2010 03:15:44 +0000 (12:15 +0900)
committerKarolin Seeger <kseeger@samba.org>
Thu, 11 Mar 2010 08:52:45 +0000 (09:52 +0100)
Fix bug #1206 (netatalk vfs causes segfaults in samba).
(cherry picked from commit 531a9ebd52fe65196bb01632a296b40a92a43b4c)

source3/modules/vfs_netatalk.c

index e2fa0fb88a88fb1a015eed220e84cef480f6732b..885a972ac32ddd7c83df7eef3ab3f9917aeb417c 100644 (file)
@@ -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 ++) {