From 594a046b88abf26c2c2a314ca5b54e4c808ba801 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Sun, 31 Oct 2010 13:05:48 +0000 Subject: [PATCH] Merged revisions 85982 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85982 | antoine.pitrou | 2010-10-30 18:19:14 +0200 (sam., 30 oct. 2010) | 4 lines Issue #10253: FileIO leaks a file descriptor when trying to open a file for append that isn't seekable. Patch by Brian Brazil. ........ --- Lib/test/test_fileio.py | 1 + Misc/NEWS | 3 +++ Modules/_io/fileio.c | 7 ++++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py index cb6ec8e0207..a63ba06bb41 100644 --- a/Lib/test/test_fileio.py +++ b/Lib/test/test_fileio.py @@ -341,6 +341,7 @@ class OtherFileTests(unittest.TestCase): f.truncate(15) self.assertEqual(f.tell(), 5) self.assertEqual(f.seek(0, os.SEEK_END), 15) + f.close() def testTruncateOnWindows(self): def bug801631(): diff --git a/Misc/NEWS b/Misc/NEWS index dc5dca453fb..82c0f513a12 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -66,6 +66,9 @@ Core and Builtins Library ------- +- Issue #10253: FileIO leaks a file descriptor when trying to open a file + for append that isn't seekable. Patch by Brian Brazil. + - Issue #6105: json.dumps now respects OrderedDict's iteration order. - Issue #9295: Fix a crash under Windows when calling close() on a file diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c index a2a5f737f78..a685b134a3b 100644 --- a/Modules/_io/fileio.c +++ b/Modules/_io/fileio.c @@ -367,8 +367,13 @@ 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 (pos == NULL) { + if (closefd) { + close(self->fd); + self->fd = -1; + } goto error; + } Py_DECREF(pos); }