commit fc477048e1dee78a1b4376584cac052be1b4752d
author Alexandre Vassalotti <alexandre@peadrop.com> Wed Jul 22 02:24:49 2009 +0000
committer Alexandre Vassalotti <alexandre@peadrop.com> Wed Jul 22 02:24:49 2009 +0000
tree 3018e0c1dc2d6896d3fd27d44f9ae63de3e27d61
parent 4f1f422713358767de04642724ea4f96c6404f92

Issue #6242: Fix deallocator of io.StringIO and io.BytesIO.

Modules/_io/bytesio.c

diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c
index 7675846..daef78f 100644
--- a/Modules/_io/bytesio.c
+++ b/Modules/_io/bytesio.c
@@ -609,11 +609,14 @@
 static void
 bytesio_dealloc(bytesio *self)
 {
+    _PyObject_GC_UNTRACK(self);
     if (self->buf != NULL) {
         PyMem_Free(self->buf);
         self->buf = NULL;
     }
-    Py_TYPE(self)->tp_clear((PyObject *)self);
+    Py_CLEAR(self->dict);
+    if (self->weakreflist != NULL)
+        PyObject_ClearWeakRefs((PyObject *) self);
     Py_TYPE(self)->tp_free(self);
 }
 
@@ -667,7 +670,6 @@
 bytesio_traverse(bytesio *self, visitproc visit, void *arg)
 {
     Py_VISIT(self->dict);
-    Py_VISIT(self->weakreflist);
     return 0;
 }
 
@@ -675,8 +677,6 @@
 bytesio_clear(bytesio *self)
 {
     Py_CLEAR(self->dict);
-    if (self->weakreflist != NULL)
-        PyObject_ClearWeakRefs((PyObject *)self);
     return 0;
 }