[SCM] Samba Shared Repository - branch v3-4-test updated

Karolin Seeger kseeger at samba.org
Thu Mar 11 01:52:37 MST 2010


The branch, v3-4-test has been updated
       via  12dc721... vfs_netatalk: Segfault if hide files or veto files has no ".AppleDouble"
      from  cf67945... WHATSNEW: Start release notes for Samba 3.4.8.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit 12dc7210fdba44d4df87102d44ee1bb7fc51f9f3
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"
    
    Fix bug #1206 (netatalk vfs causes segfaults in samba).
    (cherry picked from commit 531a9ebd52fe65196bb01632a296b40a92a43b4c)

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

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 e2fa0fb..885a972 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 ++) {


-- 
Samba Shared Repository


More information about the samba-cvs mailing list