summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-10-04 16:39:18 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2006-10-04 16:39:18 +0200
commit722f0d8b1a276f2f069fc090db2365ae2659fac9 (patch)
tree2466c0cbf607e10cd1b3570c0efde6e6398f5c5d
parentc00b2271e6295c248c18d1bd62e14df372004e85 (diff)
downloadpython-apt-722f0d8b1a276f2f069fc090db2365ae2659fac9.tar.gz
* python/generic.h:
- use PyObject_DEL() instead of PyMem_DEL()
-rw-r--r--debian/changelog9
-rw-r--r--python/generic.h4
2 files changed, 11 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 1979f75d..3ab21a51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+python-apt (0.6.21) unstable; urgency=low
+
+ * python/generic.h:
+ - fix incorrect use of PyMem_DEL(), use pyObject_DEL()
+ instead. This fixes a nasty segfault with python2.5
+ (lp: 63226)
+
+ --
+
python-apt (0.6.20) unstable; urgency=low
* python/pkgmanager.cc:
diff --git a/python/generic.h b/python/generic.h
index b47ed1a2..a1b662bb 100644
--- a/python/generic.h
+++ b/python/generic.h
@@ -113,7 +113,7 @@ template <class T>
void CppDealloc(PyObject *Obj)
{
GetCpp<T>(Obj).~T();
- PyMem_DEL(Obj);
+ PyObject_DEL(Obj);
}
template <class T>
@@ -123,7 +123,7 @@ void CppOwnedDealloc(PyObject *iObj)
Obj->Object.~T();
if (Obj->Owner != 0)
Py_DECREF(Obj->Owner);
- PyMem_DEL(Obj);
+ PyObject_DEL(Obj);
}
inline PyObject *CppPyString(std::string Str)