[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  f8a85ed5693 s3:utils: Add missing NULL check in rpc_fetch_domain_aliases()
       via  77dbe6b9efd s3:locking: Add missing NULL check
      from  b1740f3bafc CI: split out "samba-ad-dc-ntvfs[-py2]" test targets

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


- Log -----------------------------------------------------------------
commit f8a85ed5693d31b517fd8d3b15c7a4300cdb81c9
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Feb 4 17:23:05 2019 +0100

    s3:utils: Add missing NULL check in rpc_fetch_domain_aliases()
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed Feb 13 00:52:25 CET 2019 on sn-devel-144

commit 77dbe6b9efd2b8051c4c1a7ad1233bee3ca61573
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Feb 4 17:19:55 2019 +0100

    s3:locking: Add missing NULL check
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 source3/locking/locking.c | 3 +++
 source3/utils/net_rpc.c   | 4 ++++
 2 files changed, 7 insertions(+)


Changeset truncated at 500 lines:

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index ae5f0bbcf33..d4c3b32be7f 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -150,6 +150,9 @@ bool strict_lock_check_default(files_struct *fsp, struct lock_struct *plock)
 		 * autocleanup. This is the slow path anyway.
 		 */
 		br_lck = brl_get_locks(talloc_tos(), fsp);
+		if (br_lck == NULL) {
+			return true;
+		}
 		ret = brl_locktest(br_lck, plock);
 		TALLOC_FREE(br_lck);
 	}
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index f2d63d2af65..a56190f7be5 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -4669,6 +4669,10 @@ static NTSTATUS rpc_fetch_domain_aliases(struct rpc_pipe_client *pipe_hnd,
 
 			if (alias.num_members > 0) {
 				alias.members = SMB_MALLOC_ARRAY(struct dom_sid, alias.num_members);
+				if (alias.members == NULL) {
+					status = NT_STATUS_NO_MEMORY;
+					goto done;
+				}
 
 				for (j = 0; j < alias.num_members; j++)
 					sid_copy(&alias.members[j],


-- 
Samba Shared Repository