Fix possibility of rare crash during dealloc. Fixes #75

zopefoundation · Sep 15, 2017 · 16e70dd · 16e70dd
1 parent 9e6e910
commit 16e70dd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/BTrees/BTreeTemplate.c b/BTrees/BTreeTemplate.c
@@ -2277,8 +2277,10 @@ BTree_init(PyObject *self, PyObject *args, PyObject *kwds)
 static void
 BTree_dealloc(BTree *self)
 {
-    if (self->state != cPersistent_GHOST_STATE)
+    PyObject_GC_UnTrack((PyObject *)self);
+    if (self->state != cPersistent_GHOST_STATE) {
         _BTree_clear(self);
+    }
     cPersistenceCAPI->pertype->tp_dealloc((PyObject *)self);
 }
 

diff --git a/BTrees/BucketTemplate.c b/BTrees/BucketTemplate.c
@@ -1708,8 +1708,10 @@ Bucket_init(PyObject *self, PyObject *args, PyObject *kwds)
 static void
 bucket_dealloc(Bucket *self)
 {
-    if (self->state != cPersistent_GHOST_STATE)
+    PyObject_GC_UnTrack((PyObject *)self);
+    if (self->state != cPersistent_GHOST_STATE) {
         _bucket_clear(self);
+    }
 
     cPersistenceCAPI->pertype->tp_dealloc((PyObject *)self);
 }

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -9,6 +9,9 @@
   BTrees is used but the ``persistent`` C extension is not available.
   Previously this could result in an odd ``AttributeError``. See
   https://github.com/zopefoundation/BTrees/pull/55
+- Fix the possibility of a rare crash in the C extension when
+  deallocating items. See https://github.com/zopefoundation/BTrees/issues/75
+
 
 4.4.1 (2017-01-24)
 ------------------