diff options
| -rw-r--r-- | Lib/test/test_fileio.py | 11 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/_io/fileio.c | 12 |
3 files changed, 20 insertions, 6 deletions
diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py index 9854d0c..99f2069 100644 --- a/Lib/test/test_fileio.py +++ b/Lib/test/test_fileio.py @@ -404,6 +404,17 @@ class OtherFileTests(unittest.TestCase): self.assertRaises(ValueError, _FileIO, "/some/invalid/name", "rt") self.assertEqual(w.warnings, []) + def testUnclosedFDOnException(self): + class MyException(Exception): pass + class MyFileIO(_FileIO): + def __setattr__(self, name, value): + if name == "name": + raise MyException("blocked setting name") + return super(MyFileIO, self).__setattr__(name, value) + fd = os.open(__file__, os.O_RDONLY) + self.assertRaises(MyException, MyFileIO, fd) + os.close(fd) # should not raise OSError(EBADF) + def test_main(): # Historically, these tests have been sloppy about removing TESTFN. @@ -10,6 +10,9 @@ What's New in Python 3.3.0 Beta 1? Core and Builtins ----------------- +- Issue #10053: Don't close FDs when FileIO.__init__ fails. Loosely based on + the work by Hirokazu Yamamoto. + - Issue #15096: Removed support for ur'' as the raw notation isn't compatible with Python 2.x's raw unicode strings. diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c index 726d17b..31e2994 100644 --- a/Modules/_io/fileio.c +++ b/Modules/_io/fileio.c @@ -227,6 +227,7 @@ fileio_init(PyObject *oself, PyObject *args, PyObject *kwds) int flags = 0; int fd = -1; int closefd = 1; + int fd_is_own = 0; assert(PyFileIO_Check(oself)); if (self->fd >= 0) { @@ -376,6 +377,7 @@ fileio_init(PyObject *oself, PyObject *args, PyObject *kwds) #endif self->fd = open(name, flags, 0666); Py_END_ALLOW_THREADS + fd_is_own = 1; } else { PyObject *fdobj = PyObject_CallFunction( opener, "Oi", nameobj, flags); @@ -393,6 +395,7 @@ fileio_init(PyObject *oself, PyObject *args, PyObject *kwds) if (self->fd == -1) { goto error; } + fd_is_own = 1; } if (self->fd < 0) { @@ -421,13 +424,8 @@ fileio_init(PyObject *oself, PyObject *args, PyObject *kwds) end of file (otherwise, it might be done only on the first write()). */ PyObject *pos = portable_lseek(self->fd, NULL, 2); - if (pos == NULL) { - if (closefd) { - close(self->fd); - self->fd = -1; - } + if (pos == NULL) goto error; - } Py_DECREF(pos); } @@ -435,6 +433,8 @@ fileio_init(PyObject *oself, PyObject *args, PyObject *kwds) error: ret = -1; + if (!fd_is_own) + self->fd = -1; if (self->fd >= 0) internal_close(self); |