[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  5290fac s3: Fix Coverity ID 2582: FORWARD_NULL
       via  9cc68e4 s3: Fix Coverity ID 2583: RESOURCE_LEAK
      from  59887ed s3: Remove unused name_queries

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


- Log -----------------------------------------------------------------
commit 5290faca7a5ae5f3f0309a42586768a5c93bfb9d
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Jun 19 19:23:47 2011 +0200

    s3: Fix Coverity ID 2582: FORWARD_NULL
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Sun Jun 19 20:46:43 CEST 2011 on sn-devel-104

commit 9cc68e49ee0744ecd64f12fc0f0c54e89bc6773c
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Jun 19 19:23:47 2011 +0200

    s3: Fix Coverity ID 2583: RESOURCE_LEAK

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

Summary of changes:
 source3/libsmb/libsmb_server.c |    6 +++++-
 source3/smbd/smb2_ioctl.c      |    5 +++++
 2 files changed, 10 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
index 4dbc265..755ef2d 100644
--- a/source3/libsmb/libsmb_server.c
+++ b/source3/libsmb/libsmb_server.c
@@ -246,7 +246,7 @@ SMBC_server_internal(TALLOC_CTX *ctx,
 {
 	SMBCSRV *srv=NULL;
 	char *workgroup = NULL;
-	struct cli_state *c;
+	struct cli_state *c = NULL;
 	const char *server_n = server;
         int is_ipc = (share != NULL && strcmp(share, "IPC$") == 0);
 	uint32 fs_attrs = 0;
@@ -586,6 +586,10 @@ done:
 		workgroup = *pp_workgroup;
 	}
 	if(!workgroup) {
+		if (c != NULL) {
+			cli_shutdown(c);
+		}
+		SAFE_FREE(srv);
 		return NULL;
 	}
 
diff --git a/source3/smbd/smb2_ioctl.c b/source3/smbd/smb2_ioctl.c
index a5b8326..bce02b0 100644
--- a/source3/smbd/smb2_ioctl.c
+++ b/source3/smbd/smb2_ioctl.c
@@ -399,6 +399,11 @@ static struct tevent_req *smbd_smb2_ioctl_send(TALLOC_CTX *mem_ctx,
 		char *pdata;
 		NTSTATUS status;
 
+		if (fsp == NULL) {
+			tevent_req_nterror(req, NT_STATUS_FILE_CLOSED);
+			return tevent_req_post(req, ev);
+		}
+
 		if (in_max_output < 16) {
 			DEBUG(0,("FSCTL_GET_SHADOW_COPY_DATA: "
 				 "in_max_output(%u) < 16 is invalid!\n",


-- 
Samba Shared Repository