[SCM] Samba Shared Repository - branch master updated

[Uri Simchoni]

The branch, master has been updated
       via  1570ae0 lib: Fix 1354521 Unchecked return value
       via  801b1ad ntvfs: Fix CID 1354522 Unchecked return value
      from  247481c s3: smbd: Change dptr_create() to take a const struct smb_filename * instead of const char *.

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


- Log -----------------------------------------------------------------
commit 1570ae07616c6a2d292d39590e132e490b468e91
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Mar 1 12:43:32 2016 +0100

    lib: Fix 1354521 Unchecked return value
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Uri Simchoni <uri at samba.org>
    
    Autobuild-User(master): Uri Simchoni <uri at samba.org>
    Autobuild-Date(master): Tue Mar  1 21:49:44 CET 2016 on sn-devel-144

commit 801b1ada51138e59017f40e501924b7e13d58b89
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Mar 1 12:42:37 2016 +0100

    ntvfs: Fix CID 1354522 Unchecked return value
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Uri Simchoni <uri at samba.org>

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

Summary of changes:
 lib/tdr/tdr.c                     | 8 ++++++--
 source4/ntvfs/nbench/vfs_nbench.c | 7 ++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tdr/tdr.c b/lib/tdr/tdr.c
index 95ef982..401e1cc 100644
--- a/lib/tdr/tdr.c
+++ b/lib/tdr/tdr.c
@@ -392,12 +392,16 @@ void tdr_print_debug_helper(struct tdr_print *tdr, const char *format, ...)
 {
 	va_list ap;
 	char *s = NULL;
-	int i;
+	int i, ret;
 
 	va_start(ap, format);
-	vasprintf(&s, format, ap);
+	ret = vasprintf(&s, format, ap);
 	va_end(ap);
 
+	if (ret == -1) {
+		return;
+	}
+
 	for (i=0;i<tdr->level;i++) { DEBUG(0,("    ")); }
 
 	DEBUG(0,("%s\n", s));
diff --git a/source4/ntvfs/nbench/vfs_nbench.c b/source4/ntvfs/nbench/vfs_nbench.c
index 42a3f36..e6f725a 100644
--- a/source4/ntvfs/nbench/vfs_nbench.c
+++ b/source4/ntvfs/nbench/vfs_nbench.c
@@ -46,11 +46,16 @@ static void nbench_log(struct ntvfs_request *req,
 	struct nbench_private *nprivates = req->async_states->ntvfs->private_data;
 	va_list ap;
 	char *s = NULL;
+	int ret;
 
 	va_start(ap, format);
-	vasprintf(&s, format, ap);
+	ret = vasprintf(&s, format, ap);
 	va_end(ap);
 
+	if (ret == -1) {
+		return;
+	}
+
 	write(nprivates->log_fd, s, strlen(s));
 	free(s);
 }


-- 
Samba Shared Repository