traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #28387: Fixed possible crash in _io.TextIOWrapper deallocator when 

the garbage collector is invoked in other thread.
Based on patch by Sebastian Cufre.
This commit is contained in:
Serhiy Storchaka 2016-11-03 15:38:17 +02:00
parent c96b8fcf25 a7c972e03b
commit 5f548a24a4
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/ACKS
View File

@ -321,6 +321,7 @@ Felipe Cruz
Drew Csillag
Alessandro Cucci
Joaquin Cuenca Abela
Sebastian Cufre
John Cugini
Tom Culliton
Raúl Cumplido

4
Misc/NEWS
View File

@ -16,6 +16,10 @@ Core and Builtins
Library
-------
- Issue #28387: Fixed possible crash in _io.TextIOWrapper deallocator when
the garbage collector is invoked in other thread. Based on patch by
Sebastian Cufre.
Documentation
-------------

17
Modules/_io/textio.c
View File

@ -1103,7 +1103,7 @@ _io_TextIOWrapper___init___impl(textio *self, PyObject *buffer,
}
static int
_textiowrapper_clear(textio *self)
textiowrapper_clear(textio *self)
{
self->ok = 0;
Py_CLEAR(self->buffer);
@ -1116,6 +1116,8 @@ _textiowrapper_clear(textio *self)
Py_CLEAR(self->snapshot);
Py_CLEAR(self->errors);
Py_CLEAR(self->raw);
Py_CLEAR(self->dict);
return 0;
}
@ -1125,11 +1127,11 @@ textiowrapper_dealloc(textio *self)
self->finalizing = 1;
if (_PyIOBase_finalize((PyObject *) self) < 0)
return;
_textiowrapper_clear(self);
self->ok = 0;
_PyObject_GC_UNTRACK(self);
if (self->weakreflist != NULL)
PyObject_ClearWeakRefs((PyObject *)self);
Py_CLEAR(self->dict);
textiowrapper_clear(self);
Py_TYPE(self)->tp_free((PyObject *)self);
}
@ -1151,15 +1153,6 @@ textiowrapper_traverse(textio *self, visitproc visit, void *arg)
return 0;
}
static int
textiowrapper_clear(textio *self)
{
if (_textiowrapper_clear(self) < 0)
return -1;
Py_CLEAR(self->dict);
return 0;
}
static PyObject *
textiowrapper_closed_get(textio *self, void *context);