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

bpo-34068: _io__IOBase_close_impl could call _PyObject_SetAttrId with an exception set (GH-8282)

This commit is contained in:
Zackery Spytz 2018-07-17 00:31:44 -06:00 committed by Serhiy Storchaka
parent 56d8f57b83
commit 28f07364f0
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/test/test_io.py
View File

@ -968,6 +968,16 @@ class IOTest(unittest.TestCase):
self.assertSequenceEqual(buffer[result:], unused)
self.assertEqual(len(reader.avail), avail - result)
def test_close_assert(self):
class R(self.IOBase):
def __setattr__(self, name, value):
pass
def flush(self):
raise OSError()
f = R()
# This would cause an assertion failure.
self.assertRaises(OSError, f.close)
class CIOTest(IOTest):

3
Misc/NEWS.d/next/Core and Builtins/2018-07-14-08-58-46.bpo-34068.9xfM55.rst Normal file
View File

@ -0,0 +1,3 @@
In :meth:`io.IOBase.close`, ensure that the :attr:`~io.IOBase.closed`
attribute is not set with a live exception. Patch by Zackery Spytz and Serhiy
Storchaka.

12
Modules/_io/iobase.c
View File

@ -224,8 +224,8 @@ static PyObject *
_io__IOBase_close_impl(PyObject *self)
/*[clinic end generated code: output=63c6a6f57d783d6d input=f4494d5c31dbc6b7]*/
{
PyObject *res;
int closed = iobase_is_closed(self);
PyObject *res, *exc, *val, *tb;
int rc, closed = iobase_is_closed(self);
if (closed < 0) {
return NULL;
@ -236,9 +236,11 @@ _io__IOBase_close_impl(PyObject *self)
res = PyObject_CallMethodObjArgs(self, _PyIO_str_flush, NULL);
if (_PyObject_SetAttrId(self, &PyId___IOBase_closed, Py_True) < 0) {
Py_XDECREF(res);
return NULL;
PyErr_Fetch(&exc, &val, &tb);
rc = _PyObject_SetAttrId(self, &PyId___IOBase_closed, Py_True);
_PyErr_ChainExceptions(exc, val, tb);
if (rc < 0) {
Py_CLEAR(res);
}
if (res == NULL)