[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  c1fb657... vfs_netatalk: Segfault if hide files or veto files has no ".AppleDouble"
      from  3fd5ac6... s4-smbtorture: only look at DATA_BLOB pointer when einfo[0].data_length > 0.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit c1fb657afc1184d192e0fbca05a8145e2383ffe7
Author: SATOH Fumiyasu <fumiyas at osstech.co.jp>
Date:   Wed Mar 10 12:15:44 2010 +0900

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

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/vfs_netatalk.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_netatalk.c b/source3/modules/vfs_netatalk.c
index 68f6a31..d5a85b3 100644
--- a/source3/modules/vfs_netatalk.c
+++ b/source3/modules/vfs_netatalk.c
@@ -131,7 +131,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 ++) {


-- 
Samba Shared Repository