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

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  7024435 s3-nmbd: fix memleak in create_listen_fdset().
       via  363b818 libcli/auth: let spnego_write_mech_types() check the asn1_load() return
      from  62b9ad4 Fix bug 8480 - acl_xattr can free an invalid pointer if no blob is loaded.

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


- Log -----------------------------------------------------------------
commit 702443500268ceb4dd3e0d3a1a130bca465be266
Author: Günther Deschner <gd at samba.org>
Date:   Thu Aug 4 17:28:05 2011 +0200

    s3-nmbd: fix memleak in create_listen_fdset().
    
    Guenther
    
    The last 2 patches address bug #8491 (fix some coverity issues).

commit 363b81899401f01de11ddbd8036b55a472806b38
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Dec 2 00:40:01 2010 +0100

    libcli/auth: let spnego_write_mech_types() check the asn1_load() return
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Tue Dec  7 18:23:41 CET 2010 on sn-devel-104

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

Summary of changes:
 libcli/auth/spnego_parse.c  |    4 ++++
 source3/nmbd/nmbd_packets.c |    2 ++
 2 files changed, 6 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/auth/spnego_parse.c b/libcli/auth/spnego_parse.c
index 86b083d..27ede1b 100644
--- a/libcli/auth/spnego_parse.c
+++ b/libcli/auth/spnego_parse.c
@@ -380,6 +380,10 @@ bool spnego_write_mech_types(TALLOC_CTX *mem_ctx,
 {
 	struct asn1_data *asn1 = asn1_init(mem_ctx);
 
+	if (asn1 == NULL) {
+		return false;
+	}
+
 	/* Write mechTypes */
 	if (mech_types && *mech_types) {
 		int i;
diff --git a/source3/nmbd/nmbd_packets.c b/source3/nmbd/nmbd_packets.c
index e53eebb..51c9acc 100644
--- a/source3/nmbd/nmbd_packets.c
+++ b/source3/nmbd/nmbd_packets.c
@@ -1715,6 +1715,7 @@ only use %d.\n", count, FD_SETSIZE));
 	if (ClientNMB < 0 || ClientNMB >= FD_SETSIZE) {
 		errno = EBADF;
 		SAFE_FREE(pset);
+		SAFE_FREE(sock_array);
 		return True;
 	}
 
@@ -1752,6 +1753,7 @@ only use %d.\n", count, FD_SETSIZE));
 	if (ClientDGRAM < 0 || ClientDGRAM >= FD_SETSIZE) {
 		errno = EBADF;
 		SAFE_FREE(pset);
+		SAFE_FREE(sock_array);
 		return True;
 	}
 	FD_SET(ClientDGRAM,pset);


-- 
Samba Shared Repository