[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  76f370e libgpo: Fix CID 1422263 Resource leak
       via  4806f05 libgpo: Fix CID 1422262 Explicit null dereferenced
      from  33f88ab s3: smbd: Chain code can return uninitialized memory when talloc buffer is grown.

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


- Log -----------------------------------------------------------------
commit 76f370edae59d11143edb5983e3277b33d9af422
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Nov 21 20:41:47 2017 +0100

    libgpo: Fix CID 1422263 Resource leak
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed Nov 22 02:03:17 CET 2017 on sn-devel-144

commit 4806f0505e3ab6cd1aedd0e79c81e3a87afb9b18
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Nov 21 20:30:08 2017 +0100

    libgpo: Fix CID 1422262 Explicit null dereferenced
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 libgpo/pygpo.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/libgpo/pygpo.c b/libgpo/pygpo.c
index a54ddb9..d7bb173 100644
--- a/libgpo/pygpo.c
+++ b/libgpo/pygpo.c
@@ -175,12 +175,16 @@ static int py_ads_init(ADS *self, PyObject *args, PyObject *kwds)
 	}
 
 	if (lp_obj) {
+		bool ok;
 		lp_ctx = pytalloc_get_type(lp_obj, struct loadparm_context);
 		if (lp_ctx == NULL) {
 			return -1;
 		}
+		ok = lp_load_initial_only(lp_ctx->szConfigFile);
+		if (!ok) {
+			return -1;
+		}
 	}
-	if (!lp_load_initial_only(lp_ctx->szConfigFile)) return -1;
 
 	if (self->cli_creds) {
 		realm = cli_credentials_get_realm(self->cli_creds);
@@ -244,6 +248,7 @@ static PyObject* py_ads_connect(ADS *self)
 		if (!strupper_m(self->ads_ptr->auth.realm)) {
 			PyErr_SetString(PyExc_SystemError, "Failed to strdup");
 			TALLOC_FREE(frame);
+			SAFE_FREE(passwd);
 			Py_RETURN_FALSE;
 		}
 
@@ -251,6 +256,7 @@ static PyObject* py_ads_connect(ADS *self)
 		if (!ADS_ERR_OK(status)) {
 			PyErr_SetString(PyExc_SystemError, "ads_connect() failed");
 			TALLOC_FREE(frame);
+			SAFE_FREE(passwd);
 			Py_RETURN_FALSE;
 		}
 	}


-- 
Samba Shared Repository