diff --git a/Lib/aifc.py b/Lib/aifc.py index 981f8010690e00..880ad50a48da67 100644 --- a/Lib/aifc.py +++ b/Lib/aifc.py @@ -135,6 +135,7 @@ """ import struct +import warnings import __builtin__ __all__ = ["Error","open","openfp"] @@ -316,16 +317,16 @@ def initfp(self, file): except EOFError: break chunkname = chunk.getname() - if chunkname == 'COMM': + if chunkname == b'COMM': self._read_comm_chunk(chunk) self._comm_chunk_read = 1 - elif chunkname == 'SSND': + elif chunkname == b'SSND': self._ssnd_chunk = chunk dummy = chunk.read(8) self._ssnd_seek_needed = 0 - elif chunkname == 'FVER': + elif chunkname == b'FVER': self._version = _read_ulong(chunk) - elif chunkname == 'MARK': + elif chunkname == b'MARK': self._readmark(chunk) chunk.skip() if not self._comm_chunk_read or not self._ssnd_chunk: @@ -465,13 +466,18 @@ def _read_comm_chunk(self, chunk): self._nframes = _read_long(chunk) self._sampwidth = (_read_short(chunk) + 7) // 8 self._framerate = int(_read_float(chunk)) + if self._sampwidth <= 0: + raise Error, 'bad sample width' + if self._nchannels <= 0: + raise Error, 'bad # of channels' + self._framesize = self._nchannels * self._sampwidth if self._aifc: #DEBUG: SGI's soundeditor produces a bad size :-( kludge = 0 if chunk.chunksize == 18: kludge = 1 - print 'Warning: bad COMM chunk size' + warnings.warn("bad COMM chunk size") chunk.chunksize = 23 #DEBUG end self._comptype = chunk.read(4) @@ -535,11 +541,13 @@ def _readmark(self, chunk): # a position 0 and name '' self._markers.append((id, pos, name)) except EOFError: - print 'Warning: MARK chunk contains only', - print len(self._markers), - if len(self._markers) == 1: print 'marker', - else: print 'markers', - print 'instead of', nmarkers + warning_message = 'MARK chunk contains only ' + str(len(self._markers)) + if len(self._markers) == 1: + warning_message += ' marker ' + else: + warning_message += ' markers ' + warning_message += 'instead of ' + str(nmarkers) + warnings.warn(warning_message) class Aifc_write: # Variables used in this class: diff --git a/Lib/sunau.py b/Lib/sunau.py index b53044d22b1648..b5d83ea4b464c6 100644 --- a/Lib/sunau.py +++ b/Lib/sunau.py @@ -194,6 +194,8 @@ def initfp(self, file): raise Error, 'unknown encoding' self._framerate = int(_read_u32(file)) self._nchannels = int(_read_u32(file)) + if not self._nchannels: + raise Error('bad # of channels') self._framesize = self._framesize * self._nchannels if self._hdr_size > 24: self._info = file.read(self._hdr_size - 24) diff --git a/Lib/test/test_aifc.py b/Lib/test/test_aifc.py index 92bbe7bc75da93..f21798dfe4bc7c 100644 --- a/Lib/test/test_aifc.py +++ b/Lib/test/test_aifc.py @@ -7,6 +7,7 @@ import sys import struct import aifc +from test.test_support import check_warnings class AifcTest(audiotests.AudioWriteTests, @@ -216,47 +217,68 @@ def test_read_no_comm_chunk(self): def test_read_no_ssnd_chunk(self): b = b'FORM' + struct.pack('>L', 4) + b'AIFC' - b += b'COMM' + struct.pack('>LhlhhLL', 38, 0, 0, 0, 0, 0, 0) + b += b'COMM' + struct.pack('>LhlhhLL', 38, 1, 0, 8, + 0x4000 | 12, 11025<<18, 0) b += b'NONE' + struct.pack('B', 14) + b'not compressed' + b'\x00' with self.assertRaisesRegexp(aifc.Error, 'COMM chunk and/or SSND chunk' ' missing'): aifc.open(io.BytesIO(b)) def test_read_wrong_compression_type(self): - b = 'FORM' + struct.pack('>L', 4) + 'AIFC' - b += 'COMM' + struct.pack('>LhlhhLL', 23, 0, 0, 0, 0, 0, 0) - b += 'WRNG' + struct.pack('B', 0) + b = b'FORM' + struct.pack('>L', 4) + b'AIFC' + b += b'COMM' + struct.pack('>LhlhhLL', 23, 1, 0, 8, + 0x4000 | 12, 11025<<18, 0) + b += b'WRNG' + struct.pack('B', 0) self.assertRaises(aifc.Error, aifc.open, io.BytesIO(b)) + def test_read_wrong_number_of_channels(self): + for nchannels in 0, -1: + b = b'FORM' + struct.pack('>L', 4) + b'AIFC' + b += b'COMM' + struct.pack('>LhlhhLL', 38, nchannels, 0, 8, + 0x4000 | 12, 11025<<18, 0) + b += b'NONE' + struct.pack('B', 14) + b'not compressed' + b'\x00' + b += b'SSND' + struct.pack('>L', 8) + b'\x00' * 8 + with self.assertRaisesRegexp(aifc.Error, 'bad # of channels'): + aifc.open(io.BytesIO(b)) + + def test_read_wrong_sample_width(self): + for sampwidth in 0, -1: + b = b'FORM' + struct.pack('>L', 4) + b'AIFC' + b += b'COMM' + struct.pack('>LhlhhLL', 38, 1, 0, sampwidth, + 0x4000 | 12, 11025<<18, 0) + b += b'NONE' + struct.pack('B', 14) + b'not compressed' + b'\x00' + b += b'SSND' + struct.pack('>L', 8) + b'\x00' * 8 + with self.assertRaisesRegexp(aifc.Error, 'bad sample width'): + aifc.open(io.BytesIO(b)) + def test_read_wrong_marks(self): - b = 'FORM' + struct.pack('>L', 4) + 'AIFF' - b += 'COMM' + struct.pack('>LhlhhLL', 18, 0, 0, 0, 0, 0, 0) - b += 'SSND' + struct.pack('>L', 8) + '\x00' * 8 - b += 'MARK' + struct.pack('>LhB', 3, 1, 1) - with captured_stdout() as s: + b = b'FORM' + struct.pack('>L', 4) + b'AIFF' + b += b'COMM' + struct.pack('>LhlhhLL', 18, 1, 0, 8, + 0x4000 | 12, 11025<<18, 0) + b += b'SSND' + struct.pack('>L', 8) + b'\x00' * 8 + b += b'MARK' + struct.pack('>LhB', 3, 1, 1) + with check_warnings(('MARK chunk contains only 0 markers instead of 1', UserWarning)): f = aifc.open(io.BytesIO(b)) - self.assertEqual(s.getvalue(), 'Warning: MARK chunk contains ' - 'only 0 markers instead of 1\n') - self.assertEqual(f.getmarkers(), None) + self.assertEqual(f.getmarkers(), None) def test_read_comm_kludge_compname_even(self): - b = 'FORM' + struct.pack('>L', 4) + 'AIFC' - b += 'COMM' + struct.pack('>LhlhhLL', 18, 0, 0, 0, 0, 0, 0) - b += 'NONE' + struct.pack('B', 4) + 'even' + '\x00' - b += 'SSND' + struct.pack('>L', 8) + '\x00' * 8 - with captured_stdout() as s: + b = b'FORM' + struct.pack('>L', 4) + b'AIFC' + b += b'COMM' + struct.pack('>LhlhhLL', 18, 1, 0, 8, + 0x4000 | 12, 11025<<18, 0) + b += b'NONE' + struct.pack('B', 4) + b'even' + b'\x00' + b += b'SSND' + struct.pack('>L', 8) + b'\x00' * 8 + with check_warnings(('bad COMM chunk size', UserWarning)): f = aifc.open(io.BytesIO(b)) - self.assertEqual(s.getvalue(), 'Warning: bad COMM chunk size\n') self.assertEqual(f.getcompname(), 'even') def test_read_comm_kludge_compname_odd(self): - b = 'FORM' + struct.pack('>L', 4) + 'AIFC' - b += 'COMM' + struct.pack('>LhlhhLL', 18, 0, 0, 0, 0, 0, 0) - b += 'NONE' + struct.pack('B', 3) + 'odd' - b += 'SSND' + struct.pack('>L', 8) + '\x00' * 8 - with captured_stdout() as s: + b = b'FORM' + struct.pack('>L', 4) + b'AIFC' + b += b'COMM' + struct.pack('>LhlhhLL', 18, 1, 0, 8, + 0x4000 | 12, 11025<<18, 0) + b += b'NONE' + struct.pack('B', 3) + b'odd' + b += b'SSND' + struct.pack('>L', 8) + b'\x00' * 8 + with check_warnings(('bad COMM chunk size', UserWarning)): f = aifc.open(io.BytesIO(b)) - self.assertEqual(s.getvalue(), 'Warning: bad COMM chunk size\n') self.assertEqual(f.getcompname(), 'odd') def test_write_params_raises(self): diff --git a/Lib/test/test_sunau.py b/Lib/test/test_sunau.py index f6828683521df1..1550600495fa78 100644 --- a/Lib/test/test_sunau.py +++ b/Lib/test/test_sunau.py @@ -1,6 +1,8 @@ from test.test_support import TESTFN, run_unittest import unittest from test import audiotests +import io +import struct import sys import sunau @@ -96,5 +98,41 @@ def test_main(): run_unittest(SunauPCM8Test, SunauPCM16Test, SunauPCM16Test, SunauPCM32Test, SunauULAWTest) + +class SunauLowLevelTest(unittest.TestCase): + + def test_read_bad_magic_number(self): + b = b'SPA' + with self.assertRaises(EOFError): + sunau.open(io.BytesIO(b)) + b = b'SPAM' + with self.assertRaisesRegex(sunau.Error, 'bad magic number'): + sunau.open(io.BytesIO(b)) + + def test_read_too_small_header(self): + b = struct.pack('>LLLLL', sunau.AUDIO_FILE_MAGIC, 20, 0, + sunau.AUDIO_FILE_ENCODING_LINEAR_8, 11025) + with self.assertRaisesRegex(sunau.Error, 'header size too small'): + sunau.open(io.BytesIO(b)) + + def test_read_too_large_header(self): + b = struct.pack('>LLLLLL', sunau.AUDIO_FILE_MAGIC, 124, 0, + sunau.AUDIO_FILE_ENCODING_LINEAR_8, 11025, 1) + b += b'\0' * 100 + with self.assertRaisesRegex(sunau.Error, 'header size ridiculously large'): + sunau.open(io.BytesIO(b)) + + def test_read_wrong_encoding(self): + b = struct.pack('>LLLLLL', sunau.AUDIO_FILE_MAGIC, 24, 0, 0, 11025, 1) + with self.assertRaisesRegex(sunau.Error, r'encoding not \(yet\) supported'): + sunau.open(io.BytesIO(b)) + + def test_read_wrong_number_of_channels(self): + b = struct.pack('>LLLLLL', sunau.AUDIO_FILE_MAGIC, 24, 0, + sunau.AUDIO_FILE_ENCODING_LINEAR_8, 11025, 0) + with self.assertRaisesRegex(sunau.Error, 'bad # of channels'): + sunau.open(io.BytesIO(b)) + + if __name__ == "__main__": test_main() diff --git a/Lib/test/test_wave.py b/Lib/test/test_wave.py index 9513df459386b2..9d01eacc539a43 100644 --- a/Lib/test/test_wave.py +++ b/Lib/test/test_wave.py @@ -1,6 +1,9 @@ from test.test_support import TESTFN, run_unittest import unittest from test import audiotests +from test import support +import io +import struct import sys import wave @@ -119,5 +122,66 @@ def test_unseekable_incompleted_write(self): def test_main(): run_unittest(WavePCM8Test, WavePCM16Test, WavePCM24Test, WavePCM32Test) + +class WaveLowLevelTest(unittest.TestCase): + + def test_read_no_chunks(self): + b = b'SPAM' + with self.assertRaises(EOFError): + wave.open(io.BytesIO(b)) + + def test_read_no_riff_chunk(self): + b = b'SPAM' + struct.pack('