diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2012-12-29 20:30:56 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2012-12-29 20:30:56 (GMT) |
| commit | 051722d554c7cab6ae93509f4939a03169d03ac1 (patch) | |
| tree | fff2a0014ab3a0aabf9d1053b0a44e44e5739f93 /Lib | |
| parent | ddb87ab1b4944fe85f7f1a3c8de6af664085bfbb (diff) | |
| download | cpython-051722d554c7cab6ae93509f4939a03169d03ac1.zip cpython-051722d554c7cab6ae93509f4939a03169d03ac1.tar.gz cpython-051722d554c7cab6ae93509f4939a03169d03ac1.tar.bz2 | |
Issue #16485: Fix file descriptor not being closed if file header patching fails on closing of aifc file.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/aifc.py | 8 | ||||
| -rw-r--r-- | Lib/test/test_aifc.py | 11 |
2 files changed, 16 insertions, 3 deletions
diff --git a/Lib/aifc.py b/Lib/aifc.py index 775f39c..841f5ae 100644 --- a/Lib/aifc.py +++ b/Lib/aifc.py @@ -692,7 +692,9 @@ class Aifc_write: self._patchheader() def close(self): - if self._file: + if self._file is None: + return + try: self._ensure_header_written(0) if self._datawritten & 1: # quick pad to even size @@ -703,10 +705,12 @@ class Aifc_write: self._datalength != self._datawritten or \ self._marklength: self._patchheader() + finally: # Prevent ref cycles self._convert = None - self._file.close() + f = self._file self._file = None + f.close() # # Internal methods. diff --git a/Lib/test/test_aifc.py b/Lib/test/test_aifc.py index ee4ad6b..0b19af6 100644 --- a/Lib/test/test_aifc.py +++ b/Lib/test/test_aifc.py @@ -112,6 +112,13 @@ class AIFCTest(unittest.TestCase): self.assertEqual(testfile.closed, False) f.close() self.assertEqual(testfile.closed, True) + testfile = open(TESTFN, 'wb') + fout = aifc.open(testfile, 'wb') + self.assertFalse(testfile.closed) + with self.assertRaises(aifc.Error): + fout.close() + self.assertTrue(testfile.closed) + fout.close() # do nothing def test_write_header_comptype_sampwidth(self): for comptype in (b'ULAW', b'ulaw', b'ALAW', b'alaw', b'G722'): @@ -291,11 +298,13 @@ class AIFCLowLevelTest(unittest.TestCase): def test_write_header_raises(self): fout = aifc.open(io.BytesIO(), 'wb') self.assertRaises(aifc.Error, fout.close) + fout = aifc.open(io.BytesIO(), 'wb') fout.setnchannels(1) self.assertRaises(aifc.Error, fout.close) + fout = aifc.open(io.BytesIO(), 'wb') + fout.setnchannels(1) fout.setsampwidth(1) self.assertRaises(aifc.Error, fout.close) - fout.initfp(None) def test_write_header_comptype_raises(self): for comptype in (b'ULAW', b'ulaw', b'ALAW', b'alaw', b'G722'): |