sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

pyldb: add PyErr_LDB_MESSAGE_OR_RAISE() macro

Browse Source 
The Python level message has a reference to an LDB, which should be NULL,
or the same as the dn's LDB, lest one of them is freed early.

The message LDB will be NULL until a DN is set, and if the DN is replaced,
the LDB is also be replaced (see py_ldb_msg_set_dn), so it is *unlikely*
for these to get out of sync. In addition, fetching msg.dn via python
compares the LDBs at that point (py_ldb_msg_get_dn).

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-14 16:41:43 +13:00 committed by Andrew Bartlett
parent b81b2578ad
commit f0e665f4a9
1 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/ldb/pyldb.c
View File

@ -3661,6 +3661,41 @@ static PyObject *py_ldb_msg_from_dict(PyTypeObject *type, PyObject *args)
return py_ret; return py_ret;
} }
#define pyldb_Message_as_message(pyobj) ((PyLdbMessageObject *)pyobj)->msg
#define pyldb_Message_get_pyldb(pyobj) ((PyLdbMessageObject *)pyobj)->pyldb
/*
* PyErr_LDB_MESSAGE_OR_RAISE does 3 things:
* 1. checks that a PyObject is really a PyLdbMessageObject.
* 2. checks that the ldb that the PyLdbMessageObject knows is the ldb that
* its dn knows -- but only if the underlying message has a DN.
* 3. sets message to the relevant struct ldb_message *.
*
* We need to do all this to ensure the message belongs to the right
* ldb, lest it be freed before we are ready.
*/
#define PyErr_LDB_MESSAGE_OR_RAISE(_py_obj, message) do { \
PyLdbMessageObject *_py_message = NULL; \
struct ldb_dn *_dn = NULL; \
if (_py_obj == NULL || !PyLdbMessage_Check(_py_obj)) { \
PyErr_SetString(PyExc_TypeError, \
"ldb Message object required"); \
return NULL; \
} \
_py_message = (PyLdbMessageObject *)_py_obj; \
message = pyldb_Message_as_message(_py_message); \
_dn = message->dn; \
if (_dn != NULL && \
(_py_message->pyldb->ldb_ctx != ldb_dn_get_ldb_context(_dn))) { \
PyErr_SetString(PyExc_RuntimeError, \
"Message has a stale LDB connection"); \
return NULL; \
} \
} while(0)
static PyObject *py_ldb_msg_remove_attr(PyLdbMessageObject *self, PyObject *args) static PyObject *py_ldb_msg_remove_attr(PyLdbMessageObject *self, PyObject *args)
{ {
char *name; char *name;