[SCM] Samba Shared Repository - branch master updated

[David Disseldorp]

The branch, master has been updated
       via  fe25bc7 libsmbclient: Initialize written in cli_splice_fallback()
       via  2e4878a libsmbclient: Initialize written value before use.
      from  e8b7aec winbind_krb5_localauth: Fix a compiler warning

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


- Log -----------------------------------------------------------------
commit fe25bc793d30a64f06b19f737c652b0c7389ca92
Author: Bailey Berro <baileyberro at chromium.org>
Date:   Tue Jun 26 13:13:39 2018 -0700

    libsmbclient: Initialize written in cli_splice_fallback()
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=13511
    
    Signed-off-by: Bailey Berro <baileyberro at chromium.org>
    Reviewed-by: David Mulder <dmulder at suse.com>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: David Disseldorp <ddiss at samba.org>
    
    Autobuild-User(master): David Disseldorp <ddiss at samba.org>
    Autobuild-Date(master): Mon Jul  9 21:29:48 CEST 2018 on sn-devel-144

commit 2e4878a69a62fb59d843ee53a1a9469b987e3a59
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Jul 6 11:46:44 2018 -0700

    libsmbclient: Initialize written value before use.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=13511
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: David Disseldorp <ddiss at samba.org>

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

Summary of changes:
 source3/libsmb/clireadwrite.c | 2 ++
 source3/libsmb/libsmb_file.c  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
index 3987477..00ee09e 100644
--- a/source3/libsmb/clireadwrite.c
+++ b/source3/libsmb/clireadwrite.c
@@ -1459,6 +1459,7 @@ static NTSTATUS cli_splice_fallback(TALLOC_CTX *frame,
 	uint8_t *buf = talloc_size(frame, SPLICE_BLOCK_SIZE);
 	size_t nread;
 	off_t remaining = initial_size;
+	*written = 0;
 
 	while (remaining) {
 		status = cli_read(srccli, src_fnum,
@@ -1480,6 +1481,7 @@ static NTSTATUS cli_splice_fallback(TALLOC_CTX *frame,
 		}
 		src_offset += nread;
 		dst_offset += nread;
+		*written += nread;
 		if (remaining < nread) {
 			return NT_STATUS_INTERNAL_ERROR;
 		}
diff --git a/source3/libsmb/libsmb_file.c b/source3/libsmb/libsmb_file.c
index 6b43676..ebd0bfe 100644
--- a/source3/libsmb/libsmb_file.c
+++ b/source3/libsmb/libsmb_file.c
@@ -298,7 +298,7 @@ SMBC_splice_ctx(SMBCCTX *context,
                 int (*splice_cb)(off_t n, void *priv),
                 void *priv)
 {
-	off_t written;
+	off_t written = 0;
 	TALLOC_CTX *frame = talloc_stackframe();
 	NTSTATUS status;
 


-- 
Samba Shared Repository