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

[Volker Lendecke]

The branch, v3-6-test has been updated
       via  6a0252b s3: Fix an uninitialized variable read
       via  313f788 s3: Fix Coverity ID 2326, CHECKED_RETURN (cherry picked from commit fc4095436f30efd27c2d06592923de031a4853b2)
      from  beed46d Revert "Fix bug 8021 - Incorrect string termination in volume/volume_name for TRANS2-QUERY_FS_INFO/Info Volume."

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


- Log -----------------------------------------------------------------
commit 6a0252bf0b9ecffe1982687d3f2b03d4e14b52ca
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Mar 26 13:33:40 2011 +0100

    s3: Fix an uninitialized variable read
    
    The "is_valid_policy_handle" in the exit path reads uninitialized data
    
    Lets see if this fixes Coverity ID 2172 which complains about h being
    dereferenced in the dcerpc_winreg_CloseKey.
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Sat Mar 26 14:24:28 CET 2011 on sn-devel-104
    (cherry picked from commit 288fb9d612da7d2b5abe3c7544d25775b0c4d42a)

commit 313f78897fa1233b110283388be0bdee75df3349
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Mar 26 13:29:37 2011 +0100

    s3: Fix Coverity ID 2326, CHECKED_RETURN
    (cherry picked from commit fc4095436f30efd27c2d06592923de031a4853b2)

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

Summary of changes:
 source3/libsmb/cliconnect.c        |    2 +-
 source3/services/svc_winreg_glue.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 564cf8b..819d835 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -665,7 +665,7 @@ static struct tevent_req *cli_sesssetup_blob_send(TALLOC_CTX *mem_ctx,
 		MIN(cli->max_xmit - BASE_SESSSETUP_BLOB_PACKET_SIZE, 0xFFFF);
 
 	if (!cli_sesssetup_blob_next(state, &subreq)) {
-		tevent_req_nomem(NULL, req);
+		tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
 		return tevent_req_post(req, ev);
 	}
 	tevent_req_set_callback(subreq, cli_sesssetup_blob_done, req);
diff --git a/source3/services/svc_winreg_glue.c b/source3/services/svc_winreg_glue.c
index dc367c2..06f3f91 100644
--- a/source3/services/svc_winreg_glue.c
+++ b/source3/services/svc_winreg_glue.c
@@ -153,7 +153,8 @@ bool svcctl_set_secdesc(struct messaging_context *msg_ctx,
 {
 	struct dcerpc_binding_handle *h = NULL;
 	uint32_t access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
-	struct policy_handle hive_hnd, key_hnd;
+	struct policy_handle hive_hnd;
+	struct policy_handle key_hnd = { 0, };
 	char *key = NULL;
 	bool ok = false;
 	TALLOC_CTX *tmp_ctx;


-- 
Samba Shared Repository