sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

Make sure results from GetAttrString are decref'ed where needed

Browse Source 
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett abartlet@samba.org

Autobuild-User(master): Noel Power <npower@samba.org>
Autobuild-Date(master): Wed Feb 13 14:51:12 CET 2019 on sn-devel-144
This commit is contained in:
Noel Power 2019-01-28 16:57:17 +00:00 committed by Noel Power
parent 8d3f736bba
commit 0c15c4b1db
3 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ldb/pyldb.c
View File

@ -4106,6 +4106,7 @@ static PyObject *py_register_module(PyObject *module, PyObject *args)
int ret;
struct ldb_module_ops *ops;
PyObject *input;
PyObject *tmp;
if (!PyArg_ParseTuple(args, "O", &input))
return NULL;
@ -4116,8 +4117,10 @@ static PyObject *py_register_module(PyObject *module, PyObject *args)
return NULL;
}
ops->name = talloc_strdup(ops, PyStr_AsUTF8(PyObject_GetAttrString(input, discard_const_p(char, "name"))));
tmp = PyObject_GetAttrString(input, discard_const_p(char, "name"));
ops->name = talloc_strdup(ops, PyStr_AsUTF8(tmp));
Py_XDECREF(tmp);
Py_INCREF(input);
ops->private_data = input;
ops->init_context = py_module_init;

9
source4/libnet/py_net.c
View File

@ -103,10 +103,15 @@ static void PyErr_SetDsExtendedError(enum drsuapi_DsExtendedError ext_err, const
}
}
if (error) {
PyErr_SetObject(error,
PyObject *value =
Py_BuildValue(discard_const_p(char, "(i,s)"),
ext_err,
error_description));
error_description);
PyErr_SetObject(error, value);
if (value) {
Py_DECREF(value);
}
Py_DECREF(error);
}
}

26
source4/param/provision.c
View File

@ -89,10 +89,12 @@ static PyObject *PyLdb_FromLdbContext(struct ldb_context *ldb_ctx)
ret = (PyLdbObject *)ldb_ctx_type->tp_alloc(ldb_ctx_type, 0);
if (ret == NULL) {
PyErr_NoMemory();
Py_XDECREF(ldb_ctx_type);
return NULL;
}
ret->mem_ctx = talloc_new(NULL);
ret->ldb_ctx = talloc_reference(ret->mem_ctx, ldb_ctx);
Py_XDECREF(ldb_ctx_type);
return (PyObject *)ret;
}
@ -103,7 +105,7 @@ NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
const char *configfile;
PyObject *provision_mod = NULL, *provision_dict = NULL;
PyObject *provision_fn = NULL, *py_result = NULL;
PyObject *parameters = NULL, *py_lp_ctx = NULL;
PyObject *parameters = NULL, *py_lp_ctx = NULL, *py_domaindn = NULL;
struct ldb_context *samdb;
NTSTATUS status = NT_STATUS_OK;
@ -267,7 +269,8 @@ NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
goto out;
}
result->domaindn = talloc_strdup(mem_ctx, PyStr_AsString(PyObject_GetAttrString(py_result, "domaindn")));
py_domaindn = PyObject_GetAttrString(py_result, "domaindn");
result->domaindn = talloc_strdup(mem_ctx, PyStr_AsString(py_domaindn));
/* FIXME paths */
py_lp_ctx = PyObject_GetAttrString(py_result, "lp");
@ -293,6 +296,7 @@ out:
Py_CLEAR(provision_dict);
Py_CLEAR(py_result);
Py_CLEAR(py_lp_ctx);
Py_CLEAR(py_domaindn);
if (!NT_STATUS_IS_OK(status)) {
PyErr_Print();
PyErr_Clear();
@ -388,7 +392,7 @@ NTSTATUS provision_store_self_join(TALLOC_CTX *mem_ctx, struct loadparm_context
status = NT_STATUS_UNSUCCESSFUL;
goto out;
}
parameters = PyDict_New();
if(!dict_insert(parameters,
@ -491,7 +495,8 @@ struct ldb_context *provision_get_schema(TALLOC_CTX *mem_ctx,
DATA_BLOB *override_prefixmap)
{
PyObject *schema_mod, *schema_dict, *schema_fn, *py_result, *parameters;
PyObject *py_ldb = NULL;
struct ldb_context *ldb_result = NULL;
Py_Initialize();
py_update_path(); /* Put the samba path at the start of sys.path */
@ -547,5 +552,16 @@ struct ldb_context *provision_get_schema(TALLOC_CTX *mem_ctx,
return NULL;
}
return pyldb_Ldb_AsLdbContext(PyObject_GetAttrString(py_result, "ldb"));
py_ldb = PyObject_GetAttrString(py_result, "ldb");
Py_DECREF(py_result);
ldb_result = pyldb_Ldb_AsLdbContext(py_ldb);
/*
* #TODO #FIXME There is a leak here !!!
* Looks like ldb is a new object returned from schema_fn
* We extract the ldb_ctx from that which rightly
* will be destoryed when py_ldb is decremented.
* Presently the ldb_context is returned (but the owning
* object is leaked)
*/
return ldb_result;
}