diff options
| -rw-r--r-- | Lib/test/test_io.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/_io/fileio.c | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py index dac30cbf40..a286c126c9 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -2505,6 +2505,8 @@ class MiscIOTest(unittest.TestCase): self.assertRaises(ValueError, f.read) if hasattr(f, "read1"): self.assertRaises(ValueError, f.read1, 1024) + if hasattr(f, "readall"): + self.assertRaises(ValueError, f.readall) if hasattr(f, "readinto"): self.assertRaises(ValueError, f.readinto, bytearray(1024)) self.assertRaises(ValueError, f.readline) @@ -731,6 +731,9 @@ Core and Builtins Library ------- +- Issue #12175: FileIO.readall() now raises a ValueError instead of an IOError + if the file is closed. + - Issue #10916: mmap should not segfault when a file is mapped using 0 as length and a non-zero offset, and an attempt to read past the end of file is made (IndexError is raised instead). Patch by Ross Lagerwall. diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c index 1aa5ee992d..141b6dece1 100644 --- a/Modules/_io/fileio.c +++ b/Modules/_io/fileio.c @@ -583,6 +583,8 @@ fileio_readall(fileio *self) Py_ssize_t total = 0; int n; + if (self->fd < 0) + return err_closed(); if (!_PyVerify_fd(self->fd)) return PyErr_SetFromErrno(PyExc_IOError); |