sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

pyldb: make py_ldb_dn_add_child() a bit less leaky

Browse Source 
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Douglas Bagnall 2024-03-15 12:11:18 +13:00 committed by Andrew Bartlett
parent 310624ead5
commit 67a9e573b0
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/ldb/pyldb.c
View File

@ -653,22 +653,45 @@ static PyObject *py_ldb_dn_add_child(PyObject *self, PyObject *args)
PyObject *py_other = NULL; PyObject *py_other = NULL;
struct ldb_dn *dn = NULL; struct ldb_dn *dn = NULL;
struct ldb_dn *other = NULL; struct ldb_dn *other = NULL;
TALLOC_CTX *tmp_ctx = NULL;
bool ok; bool ok;
PyErr_LDB_DN_OR_RAISE(self, dn); PyErr_LDB_DN_OR_RAISE(self, dn);
if (!PyArg_ParseTuple(args, "O", &py_other)) if (!PyArg_ParseTuple(args, "O", &py_other)) {
return NULL; return NULL;
}
if (!pyldb_Object_AsDn(NULL, py_other, ldb_dn_get_ldb_context(dn), &other)) /*
* pyldb_Object_AsDn only uses tmp_ctx if py_other is str/bytes, in
* which case it allocates a struct ldb_dn. If py_other is a PyLdbDn,
* tmp_ctx is unused and the underlying dn is borrowed.
*
* The pieces of other are reassembled onto dn using dn itself as a
* talloc context (ldb_dn_add_child assumes all dns are talloc
* contexts), after which we don't need any temporary DN we made.
*/
tmp_ctx = talloc_new(NULL);
if (tmp_ctx == NULL) {
PyErr_NoMemory();
return NULL; return NULL;
}
ok = pyldb_Object_AsDn(tmp_ctx,
py_other,
ldb_dn_get_ldb_context(dn),
&other);
if (!ok) {
TALLOC_FREE(tmp_ctx);
return NULL;
}
ok = ldb_dn_add_child(dn, other); ok = ldb_dn_add_child(dn, other);
TALLOC_FREE(tmp_ctx);
if (!ok) { if (!ok) {
PyErr_SetLdbError(PyExc_LdbError, LDB_ERR_OPERATIONS_ERROR, NULL); PyErr_SetLdbError(PyExc_LdbError, LDB_ERR_OPERATIONS_ERROR, NULL);
return NULL; return NULL;
} }
Py_RETURN_TRUE; Py_RETURN_TRUE;
} }