Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[3.6] bpo-29110: Fix file object leak in aifc.open #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 26, 2017
Merged

[3.6] bpo-29110: Fix file object leak in aifc.open #310

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a8c34e
bpo-29110: Fix file object leak in `aifc.open` when given invalid AIF…
Uberi Feb 22, 2017
09d29fc
bpo-29110: add test for Aifc_write. (GH-293)
methane Feb 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
bpo-29110: add test for Aifc_write. (GH-293) 
follow up of GH-162
(cherry picked from commit 5dc33ee)
  • Loading branch information
@methane
methane committed Feb 26, 2017
commit 09d29fcfc5b58ffc32032efd48c092723a2f2278
4 changes: 4 additions & 0 deletions Lib/aifc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,8 @@ class Aifc_read:
# _ssnd_chunk -- instantiation of a chunk class for the SSND chunk
# _framesize -- size of one frame in the file

_file = None # Set here since __del__ checks it

def initfp(self, file):
self._version = 0
self._convert = None
Expand Down Expand Up @@ -547,6 +549,8 @@ class Aifc_write:
# _datalength -- the size of the audio samples written to the header
# _datawritten -- the size of the audio samples actually written

_file = None # Set here since __del__ checks it

def __init__(self, f):
if isinstance(f, str):
file_object = builtins.open(f, 'wb')
Expand Down
10 changes: 9 additions & 1 deletion Lib/test/test_aifc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from test.support import check_no_resource_warning, findfile, TESTFN, unlink
import unittest
from unittest import mock
from test import audiotests
from audioop import byteswap
import io
Expand Down Expand Up @@ -155,7 +156,14 @@ def test_close_opened_files_on_error(self):
with self.assertRaises(aifc.Error):
# Try opening a non-AIFC file, with the expectation that
# `aifc.open` will fail (without raising a ResourceWarning)
f = self.f = aifc.open(non_aifc_file, 'rb')
self.f = aifc.open(non_aifc_file, 'rb')

# Aifc_write.initfp() won't raise in normal case. But some errors
# (e.g. MemoryError, KeyboardInterrupt, etc..) can happen.
with mock.patch.object(aifc.Aifc_write, 'initfp',
side_effect=RuntimeError):
with self.assertRaises(RuntimeError):
self.fout = aifc.open(TESTFN, 'wb')

def test_params_added(self):
f = self.f = aifc.open(TESTFN, 'wb')
Expand Down