s4/messaging/py: Fix leaks

[gd/samba-autobuild/.git] / source4 / lib / messaging / pymessaging.c

diff --git a/source4/lib/messaging/pymessaging.c b/source4/lib/messaging/pymessaging.c
index ac0cc059c12f80ba9c91853a1151ccff7b779d9f..5235d84f8e8c5e5a60d5bc6f56963d4cb8f7e913 100644 (file)
--- a/source4/lib/messaging/pymessaging.c
+++ b/source4/lib/messaging/pymessaging.c
@@ -255,6 +255,7 @@ static PyObject *py_imessaging_register(PyObject *self, PyObject *args, PyObject
                                    msg_type, py_msg_callback_wrapper);
        }
        if (NT_STATUS_IS_ERR(status)) {
+               Py_DECREF(callback_and_context);
                PyErr_SetNTSTATUS(status);
                return NULL;
        }
@@ -268,13 +269,17 @@ static PyObject *py_imessaging_deregister(PyObject *self, PyObject *args, PyObje
        int msg_type = -1;
        PyObject *callback;
        const char *kwnames[] = { "callback", "msg_type", NULL };
+       size_t removed;
 
        if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|i:deregister",
                discard_const_p(char *, kwnames), &callback, &msg_type)) {
                return NULL;
        }
 
-       imessaging_deregister(iface->msg_ctx, msg_type, callback);
+       removed = imessaging_deregister(iface->msg_ctx, msg_type, callback);
+       while (removed-- > 0) {
+               Py_DECREF(callback);
+       }
 
        Py_RETURN_NONE;
 }