pyldb: free things more often on error

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/lib/ldb/pyldb.c b/lib/ldb/pyldb.c
index 3177e20bb8bffa298de6fd3ca7fc44b8bdaa0133..14dd932099d12ba9d8983b8025cef6a5b79679a1 100644 (file)
--- a/lib/ldb/pyldb.c
+++ b/lib/ldb/pyldb.c
@@ -3137,13 +3137,13 @@ static PyObject *py_ldb_module_search(PyLdbModuleObject *self, PyObject *args, P
 
        talloc_steal(req, attrs);
 
-       PyErr_LDB_ERROR_IS_ERR_RAISE(PyExc_LdbError, ret, mod->ldb);
+       PyErr_LDB_ERROR_IS_ERR_RAISE_FREE(PyExc_LdbError, ret, mod->ldb, req);
 
        req->op.search.res = NULL;
 
        ret = mod->ops->search(mod, req);
 
-       PyErr_LDB_ERROR_IS_ERR_RAISE(PyExc_LdbError, ret, mod->ldb);
+       PyErr_LDB_ERROR_IS_ERR_RAISE_FREE(PyExc_LdbError, ret, mod->ldb, req);
 
        py_ret = PyLdbResult_FromResult(req->op.search.res);
 
@@ -3170,7 +3170,7 @@ static PyObject *py_ldb_module_add(PyLdbModuleObject *self, PyObject *args)
        mod = pyldb_Module_AsModule(self);
        ret = mod->ops->add(mod, req);
 
-       PyErr_LDB_ERROR_IS_ERR_RAISE(PyExc_LdbError, ret, mod->ldb);
+       PyErr_LDB_ERROR_IS_ERR_RAISE_FREE(PyExc_LdbError, ret, mod->ldb, req);
 
        Py_RETURN_NONE;
 }
@@ -3192,7 +3192,7 @@ static PyObject *py_ldb_module_modify(PyLdbModuleObject *self, PyObject *args)
        mod = pyldb_Module_AsModule(self);
        ret = mod->ops->modify(mod, req);
 
-       PyErr_LDB_ERROR_IS_ERR_RAISE(PyExc_LdbError, ret, mod->ldb);
+       PyErr_LDB_ERROR_IS_ERR_RAISE_FREE(PyExc_LdbError, ret, mod->ldb, req);
 
        Py_RETURN_NONE;
 }
@@ -3212,7 +3212,7 @@ static PyObject *py_ldb_module_delete(PyLdbModuleObject *self, PyObject *args)
 
        ret = pyldb_Module_AsModule(self)->ops->del(pyldb_Module_AsModule(self), req);
 
-       PyErr_LDB_ERROR_IS_ERR_RAISE(PyExc_LdbError, ret, NULL);
+       PyErr_LDB_ERROR_IS_ERR_RAISE_FREE(PyExc_LdbError, ret, NULL, req);
 
        Py_RETURN_NONE;
 }
@@ -3234,7 +3234,7 @@ static PyObject *py_ldb_module_rename(PyLdbModuleObject *self, PyObject *args)
 
        ret = pyldb_Module_AsModule(self)->ops->rename(pyldb_Module_AsModule(self), req);
 
-       PyErr_LDB_ERROR_IS_ERR_RAISE(PyExc_LdbError, ret, NULL);
+       PyErr_LDB_ERROR_IS_ERR_RAISE_FREE(PyExc_LdbError, ret, NULL, req);
 
        Py_RETURN_NONE;
 }
@@ -4726,7 +4726,7 @@ static PyObject *py_register_module(PyObject *module, PyObject *args)
                TALLOC_FREE(ops);
        }
 
-       PyErr_LDB_ERROR_IS_ERR_RAISE(PyExc_LdbError, ret, NULL);
+       PyErr_LDB_ERROR_IS_ERR_RAISE_FREE(PyExc_LdbError, ret, NULL, ops);
 
        Py_RETURN_NONE;
 }