mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-23 09:19:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

bpo-38031: Fix a possible assertion failure in _io.FileIO() (GH-GH-5688)

Browse source 
(cherry picked from commit d386115039)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>
This commit is contained in:
Miss Islington (bot) 2022-11-25 05:18:41 -08:00 • committed by GitHub
parent 59241fe2a2
commit c42681546a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/test/test_io.py
View file

@ -880,6 +880,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, \

2
Misc/NEWS.d/next/Core and Builtins/2019-09-04-19-09-49.bpo-38031.Yq4L72.rst Normal file
View file

@ -0,0 +1,2 @@
Fix a possible assertion failure in :class:`io.FileIO` when the opener
returns an invalid file descriptor.

6
Modules/_io/fileio.c
View file

@ -494,8 +494,12 @@ _Py_COMP_DIAG_POP
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