From dc6cdb234d24cbcc0cb9e5c93c01ac63898c3e40 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
Date: Sun, 14 Jun 2009 16:11:35 +0200
Subject: python/cache.cc,depcache.cc: Do not delete the depcache and cache
 pointers.

Deleting the pointers caused a crash because those pointers will also be
deleted by closing the cache file.
---
 python/cache.cc    | 4 +++-
 python/depcache.cc | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/python/cache.cc b/python/cache.cc
index 22ed9ecc..80a7a8a5 100644
--- a/python/cache.cc
+++ b/python/cache.cc
@@ -247,7 +247,9 @@ void PkgCacheFileDealloc(PyObject *Self)
    PyObject *CacheFilePy = GetOwner<pkgCache*>(Self);
    pkgCacheFile *CacheF = GetCpp<pkgCacheFile*>(CacheFilePy);
    CacheF->Close();
-   CppOwnedDeallocPtr<pkgCache *>(Self);
+   // Do not delete the pointer here, because it has already been deleted by
+   // closing the cache file.
+   CppOwnedDealloc<pkgCache *>(Self);
 }
 
 static PyObject *PkgCacheNew(PyTypeObject *type,PyObject *Args,PyObject *kwds)
diff --git a/python/depcache.cc b/python/depcache.cc
index 9bbda527..288eb0b0 100644
--- a/python/depcache.cc
+++ b/python/depcache.cc
@@ -660,7 +660,8 @@ PyTypeObject PkgDepCacheType =
    sizeof(CppOwnedPyObject<pkgDepCache *>),   // tp_basicsize
    0,                                   // tp_itemsize
    // Methods
-   CppOwnedDeallocPtr<pkgDepCache *>,   // tp_dealloc
+   // Not ..Ptr, because the pkgDepCache pointer is managed by the CacheFile.
+   CppOwnedDealloc<pkgDepCache *>,      // tp_dealloc
    0,                                   // tp_print
    0,                                   // tp_getattr
    0,                                   // tp_setattr
-- 
cgit v1.2.3