[SCM] Samba Shared Repository - branch v3-5-test updated - release-4-0-0alpha8-1388-g2520beb

[Jeremy Allison]

The branch, v3-5-test has been updated
       via  2520bebfc1163a9be5a0258cf9eeda3fe409558b (commit)
       via  cfd50746ee5e44d29f93423345bbe9961c792e4d (commit)
       via  ea2bcee0b19bbc7e6c79b5de8ba7b76528ada90f (commit)
      from  fb6a4f4eb16980aaf483207fd4f625f4d5116f86 (commit)

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


- Log -----------------------------------------------------------------
commit 2520bebfc1163a9be5a0258cf9eeda3fe409558b
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Sep 4 07:59:51 2009 +0200

    s3:winbind: Fix Coverity ID 933: FORWARD_NULL

commit cfd50746ee5e44d29f93423345bbe9961c792e4d
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Sep 4 07:57:19 2009 +0200

    s3:smbd: Fix Coverity ID 937, REVERSE_INULL

commit ea2bcee0b19bbc7e6c79b5de8ba7b76528ada90f
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Sep 4 07:52:28 2009 +0200

    s3:winbind: Fix Coverity ID 940: Resource Leak

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

Summary of changes:
 source3/smbd/open.c               |    4 ++--
 source3/winbindd/winbindd_cache.c |    1 +
 source3/winbindd/winbindd_misc.c  |    1 +
 3 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 0456355..492164c 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -3332,12 +3332,12 @@ NTSTATUS get_relative_fid_filename(connection_struct *conn,
 
 	dir_fsp = file_fsp(req, root_dir_fid);
 
-	if (is_ntfs_stream_smb_fname(dir_fsp->fsp_name)) {
+	if (dir_fsp == NULL) {
 		status = NT_STATUS_INVALID_HANDLE;
 		goto out;
 	}
 
-	if (dir_fsp == NULL) {
+	if (is_ntfs_stream_smb_fname(dir_fsp->fsp_name)) {
 		status = NT_STATUS_INVALID_HANDLE;
 		goto out;
 	}
diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index 8d44d27..6d48fe5 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -2110,6 +2110,7 @@ NTSTATUS wcache_lookup_usergroups(struct winbindd_domain *domain,
 	num_sids = centry_uint32(centry);
 	sids = talloc_array(mem_ctx, struct dom_sid, num_sids);
 	if (sids == NULL) {
+		centry_free(centry);
 		return NT_STATUS_NO_MEMORY;
 	}
 
diff --git a/source3/winbindd/winbindd_misc.c b/source3/winbindd/winbindd_misc.c
index dd5f132..9e62a1b 100644
--- a/source3/winbindd/winbindd_misc.c
+++ b/source3/winbindd/winbindd_misc.c
@@ -378,6 +378,7 @@ void winbindd_domain_info(struct winbindd_cli_state *cli)
 	if (req == NULL) {
 		DEBUG(3, ("wb_domain_request_send failed\n"));
 		request_error(cli);
+		return;
 	}
 	tevent_req_set_callback(req, domain_info_done, state);
 }


-- 
Samba Shared Repository