The branch, master has been updated via c0b9526 pytalloc: use talloc_unlink() to free py_talloc objects from feb6034 talloc: make header C++ safe
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit c0b9526aaf29442f85f62232e22aecfb484b1576 Author: Kamen Mazdrashki <kame...@samba.org> Date: Fri Oct 8 04:21:07 2010 +0300 pytalloc: use talloc_unlink() to free py_talloc objects Those type of objects are referenced every time we assign them to other py_talloc objects, which leads to runtime warnings that we are trying to free an object with references Wrap talloc_unlink() in SMB_ASSERT() to ensure we catch possible failure Autobuild-User: Kamen Mazdrashki <kame...@samba.org> Autobuild-Date: Wed Oct 20 21:37:06 UTC 2010 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: lib/talloc/pytalloc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/talloc/pytalloc.c b/lib/talloc/pytalloc.c index b0b7394..ae59b69 100644 --- a/lib/talloc/pytalloc.c +++ b/lib/talloc/pytalloc.c @@ -21,6 +21,8 @@ #include "replace.h" #include <talloc.h> #include "pytalloc.h" +#include "lib/util/debug.h" +#include "lib/util/util.h" /** * Simple dealloc for talloc-wrapping PyObjects @@ -28,7 +30,7 @@ void py_talloc_dealloc(PyObject* self) { py_talloc_Object *obj = (py_talloc_Object *)self; - talloc_free(obj->talloc_ctx); + SMB_ASSERT(talloc_unlink(NULL, obj->talloc_ctx) != -1); obj->talloc_ctx = NULL; self->ob_type->tp_free(self); } -- Samba Shared Repository