Bugfix: Delete pointers correctly, fixing memory leaks. (LP: #370149)

We previously called the destructor of the pointer. This resulted in no
object using pointers being deallocated.

This patch introduces CppDeallocPtr() and CppOwnedDeallocPtr() which do
the same as the other CppDealloc() and CppOwnedDealloc(), but use 'delete'
on the pointer instead of the deconstructor.

Furthermore, this patch also changes AcquireFile to be a CppOwnedPyObject,
owned by the Acquire object. Without this change, deleting the Acquire
object would cause a crash when AcquireFile is deallocated.

1 files changed, 19 insertions, 0 deletions

diff --git a/python/generic.h b/python/generic.h
index df4d8755..b7b958f5 100644
--- a/python/generic.h
+++ b/python/generic.h
@@ -153,6 +153,25 @@ void CppOwnedDealloc(PyObject *iObj)
    iObj->ob_type->tp_free(iObj);
 }
 
+// Pointer deallocation
+// Generic Dealloc type functions
+template <class T>
+void CppDeallocPtr(PyObject *Obj)
+{
+   delete GetCpp<T>(Obj);
+   Obj->ob_type->tp_free(Obj);
+}
+
+template <class T>
+void CppOwnedDeallocPtr(PyObject *iObj)
+{
+   CppOwnedPyObject<T> *Obj = (CppOwnedPyObject<T> *)iObj;
+   delete Obj->Object;
+   if (Obj->Owner != 0)
+      Py_DECREF(Obj->Owner);
+   iObj->ob_type->tp_free(iObj);
+}
+
 inline PyObject *CppPyString(std::string Str)
 {
    return PyString_FromStringAndSize(Str.c_str(),Str.length());