[SCM] Samba Shared Repository - branch master updated

[Uri Simchoni]

The branch, master has been updated
       via  5d7eaf9 vfs_fruit: return value of ad_pack in vfs_fruit.c
      from  cc93469 lib: Fix CID 1128553 Unchecked return value from library

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


- Log -----------------------------------------------------------------
commit 5d7eaf959a0f11be878f698305fcb8908d7ba047
Author: Ralph Boehme <slow at samba.org>
Date:   Sun Sep 27 12:11:31 2015 +0200

    vfs_fruit: return value of ad_pack in vfs_fruit.c
    
    ad_pack() in vfs_fruit.c returns false on failure and 0 on success -
    i.e. return value is interpreted as success even when it fails.
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Uri Simchoni <uri at samba.org>
    
    Autobuild-User(master): Uri Simchoni <uri at samba.org>
    Autobuild-Date(master): Tue Oct  6 16:14:42 CEST 2015 on sn-devel-104

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

Summary of changes:
 source3/modules/vfs_fruit.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index c90699f..8393366 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -567,7 +567,7 @@ static bool ad_pack(struct adouble *ad)
 	}
 	RSSVAL(ad->ad_data, ADEDOFF_NENTRIES, nent);
 
-	return 0;
+	return true;
 }
 
 /**
@@ -949,8 +949,9 @@ static ssize_t ad_header_read_rsrc(struct adouble *ad, const char *path)
 			/*
 			 * Can't use ad_write() because we might not have a fsp
 			 */
-			rc = ad_pack(ad);
-			if (rc != 0) {
+			ok = ad_pack(ad);
+			if (!ok) {
+				rc = -1;
 				goto exit;
 			}
 			/* FIXME: direct sys_pwrite(), don't have an fsp */
@@ -1211,10 +1212,11 @@ static int ad_write(struct adouble *ad, const char *path)
 {
 	int rc = 0;
 	ssize_t len;
+	bool ok;
 
-	rc = ad_pack(ad);
-	if (rc != 0) {
-		goto exit;
+	ok = ad_pack(ad);
+	if (!ok) {
+		return -1;
 	}
 
 	switch (ad->ad_type) {


-- 
Samba Shared Repository