From 634e06e465be7a8921cb95884ec427f48bf812da Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 25 Aug 2010 14:29:59 +1000 Subject: [PATCH] pytalloc: fixed py_talloc_steal() py_talloc_steal() was implemented as a macro which evaluated it's 2nd argument twice. It was often called via a macro with a 2nd argument that was a function call, for example an allocation in py_talloc_new(). This meant it allocated memory twice, and leaked one of them. This re-implements py_talloc_steal() as a function, so that it only does the allocation once. --- lib/talloc/pytalloc.c | 8 ++++++++ lib/talloc/pytalloc.h | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/talloc/pytalloc.c b/lib/talloc/pytalloc.c index 4e0b2eca2bc7..92b7b9405268 100644 --- a/lib/talloc/pytalloc.c +++ b/lib/talloc/pytalloc.c @@ -52,6 +52,14 @@ PyObject *py_talloc_steal_ex(PyTypeObject *py_type, TALLOC_CTX *mem_ctx, return (PyObject *)ret; } +/** + * Import an existing talloc pointer into a Python object. + */ +PyObject *py_talloc_steal(PyTypeObject *py_type, void *ptr) +{ + return py_talloc_steal_ex(py_type, ptr, ptr); +} + /** * Import an existing talloc pointer into a Python object, leaving the diff --git a/lib/talloc/pytalloc.h b/lib/talloc/pytalloc.h index 9b6587261c2b..cdcc57bf85de 100644 --- a/lib/talloc/pytalloc.h +++ b/lib/talloc/pytalloc.h @@ -43,8 +43,8 @@ void py_talloc_dealloc(PyObject* self); #define py_talloc_get_mem_ctx(py_obj) ((py_talloc_Object *)py_obj)->talloc_ctx PyObject *py_talloc_steal_ex(PyTypeObject *py_type, TALLOC_CTX *mem_ctx, void *ptr); +PyObject *py_talloc_steal(PyTypeObject *py_type, void *ptr); PyObject *py_talloc_reference_ex(PyTypeObject *py_type, TALLOC_CTX *mem_ctx, void *ptr); -#define py_talloc_steal(py_type, talloc_ptr) py_talloc_steal_ex(py_type, talloc_ptr, talloc_ptr) #define py_talloc_reference(py_type, talloc_ptr) py_talloc_reference_ex(py_type, talloc_ptr, talloc_ptr) /* Sane default implementation of reprfunc. */ -- 2.34.1