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

This commit is contained in:
Alexandre Vassalotti 2009-07-22 02:24:49 +00:00
parent 4f1f422713
commit fc477048e1
3 changed files with 17 additions and 6 deletions

View file

@ -609,11 +609,14 @@ bytesio_close(bytesio *self)
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 @@ static int
bytesio_traverse(bytesio *self, visitproc visit, void *arg)
{
Py_VISIT(self->dict);
Py_VISIT(self->weakreflist);
return 0;
}
@ -675,8 +677,6 @@ static int
bytesio_clear(bytesio *self)
{
Py_CLEAR(self->dict);
if (self->weakreflist != NULL)
PyObject_ClearWeakRefs((PyObject *)self);
return 0;
}