sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

lib/ldb: py LDBError avoids leak and checks for alloc failure

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 2023-10-25 13:15:36 +13:00 committed by Andrew Bartlett
parent ffa08426e0
commit 1d8024e733
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/ldb/pyldb.c
View File

@ -266,13 +266,25 @@ static PyTypeObject PyLdbControl = {
static void PyErr_SetLdbError(PyObject *error, int ret, struct ldb_context *ldb_ctx)
{
if (ret == LDB_ERR_PYTHON_EXCEPTION)
PyObject *exc = NULL;
if (ret == LDB_ERR_PYTHON_EXCEPTION) {
return; /* Python exception should already be set, just keep that */
PyErr_SetObject(error,
Py_BuildValue(discard_const_p(char, "(i,s)"), ret,
ldb_ctx == NULL?ldb_strerror(ret):ldb_errstring(ldb_ctx)));
}
exc = Py_BuildValue("(i,s)", ret,
ldb_ctx == NULL?ldb_strerror(ret):ldb_errstring(ldb_ctx));
if (exc == NULL) {
/*
* Py_BuildValue failed, and will have set its own exception.
* It isn't the one we wanted, but it will have to do.
* This is all very unexpected.
*/
fprintf(stderr, "could not make LdbError %d!\n", ret);
return;
}
PyErr_SetObject(error, exc);
Py_DECREF(exc);
}
static PyObject *py_ldb_bytes_str(PyBytesObject *self)
{
char *msg = NULL;