diff options
| author | Zackery Spytz <zspytz@gmail.com> | 2018-07-17 00:31:44 -0600 |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2018-07-17 09:31:44 +0300 |
| commit | 28f07364f066792ceee93231dbb80ae8ad98b2bb (patch) | |
| tree | d6baa09f3836f1d017b1091fdbf88bb3ff0a5c55 | |
| parent | 56d8f57b83a37b05a6f2fbc3e141bbc1ba6cb3a2 (diff) | |
| download | cpython-git-28f07364f066792ceee93231dbb80ae8ad98b2bb.tar.gz | |
bpo-34068: _io__IOBase_close_impl could call _PyObject_SetAttrId with an exception set (GH-8282)
| -rw-r--r-- | Lib/test/test_io.py | 10 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Core and Builtins/2018-07-14-08-58-46.bpo-34068.9xfM55.rst | 3 | ||||
| -rw-r--r-- | Modules/_io/iobase.c | 12 |
3 files changed, 20 insertions, 5 deletions
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py index a03a7f7810..c68b2fea85 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -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): diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-07-14-08-58-46.bpo-34068.9xfM55.rst b/Misc/NEWS.d/next/Core and Builtins/2018-07-14-08-58-46.bpo-34068.9xfM55.rst new file mode 100644 index 0000000000..0ed8ff9192 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2018-07-14-08-58-46.bpo-34068.9xfM55.rst @@ -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. diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c index 0c329bff84..5b71732ef1 100644 --- a/Modules/_io/iobase.c +++ b/Modules/_io/iobase.c @@ -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) |