[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  91ff65b vfs_fruit: Fix CID 1273290 Uninitialized scalar variable
      from  5b3c71c provision: Give a more helpful message when find_provision_key_parameters() fails

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


- Log -----------------------------------------------------------------
commit 91ff65b2f63061fa66b6bcc3c142c17b03581759
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Mar 6 09:59:25 2015 +0000

    vfs_fruit: Fix CID 1273290 Uninitialized scalar variable
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Fri Mar  6 23:56:36 CET 2015 on sn-devel-104

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

Summary of changes:
 source3/modules/vfs_fruit.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 4eace1e..0445e04 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -835,7 +835,8 @@ static ssize_t ad_header_read_rsrc(struct adouble *ad, const char *path)
 		if (rc != 0) {
 			goto exit;
 		}
-		ad_setentrylen(ad, ADEID_RFORK, sbuf.st_ex_size);
+		len = sbuf.st_ex_size;
+		ad_setentrylen(ad, ADEID_RFORK, len);
 	} else {
 		/* FIXME: direct sys_pread(), don't have an fsp */
 		len = sys_pread(fd, ad->ad_data, AD_DATASZ_DOT_UND, 0);


-- 
Samba Shared Repository