diff options
| -rw-r--r-- | Lib/test/test_io.py | 8 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Core and Builtins/2019-09-04-19-09-49.bpo-38031.Yq4L72.rst | 2 | ||||
| -rw-r--r-- | Modules/_io/fileio.c | 6 |
3 files changed, 15 insertions, 1 deletions
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py index bc6071f..c927f15 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -888,6 +888,14 @@ class IOTest(unittest.TestCase): open('non-existent', 'r', opener=badopener) self.assertEqual(str(cm.exception), 'opener returned -2') + def test_opener_invalid_fd(self): + # Check that OSError is raised with error code EBADF if the + # opener returns an invalid file descriptor (see gh-82212). + fd = os_helper.make_bad_fd() + with self.assertRaises(OSError) as cm: + self.open('foo', opener=lambda name, flags: fd) + self.assertEqual(cm.exception.errno, errno.EBADF) + def test_fileio_closefd(self): # Issue #4841 with self.open(__file__, 'rb') as f1, \ diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-09-04-19-09-49.bpo-38031.Yq4L72.rst b/Misc/NEWS.d/next/Core and Builtins/2019-09-04-19-09-49.bpo-38031.Yq4L72.rst new file mode 100644 index 0000000..b596437 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2019-09-04-19-09-49.bpo-38031.Yq4L72.rst @@ -0,0 +1,2 @@ +Fix a possible assertion failure in :class:`io.FileIO` when the opener +returns an invalid file descriptor. diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c index 0085997..659297e 100644 --- a/Modules/_io/fileio.c +++ b/Modules/_io/fileio.c @@ -485,8 +485,12 @@ _io_FileIO___init___impl(fileio *self, PyObject *nameobj, const char *mode, ret = -1; if (!fd_is_own) self->fd = -1; - if (self->fd >= 0) + if (self->fd >= 0) { + PyObject *exc, *val, *tb; + PyErr_Fetch(&exc, &val, &tb); internal_close(self); + _PyErr_ChainExceptions(exc, val, tb); + } done: #ifdef MS_WINDOWS |