From 7137803238ff54ae339e09ff676f6631000cfb28 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Thu, 17 Oct 2013 23:03:48 +0300 Subject: [PATCH] Issue #19276: Fixed the wave module on 64-bit big-endian platforms. --- Lib/wave.py | 4 +++- Misc/NEWS | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Lib/wave.py b/Lib/wave.py index 04a1a6db38..d6eef78241 100644 --- a/Lib/wave.py +++ b/Lib/wave.py @@ -80,7 +80,7 @@ class Error(Exception): WAVE_FORMAT_PCM = 0x0001 -_array_fmts = None, 'b', 'h', None, 'l' +_array_fmts = None, 'b', 'h', None, 'i' # Determine endian-ness import struct @@ -238,6 +238,7 @@ class Wave_read: import array chunk = self._data_chunk data = array.array(_array_fmts[self._sampwidth]) + assert data.itemsize == self._sampwidth nitems = nframes * self._nchannels if nitems * self._sampwidth > chunk.chunksize - chunk.size_read: nitems = (chunk.chunksize - chunk.size_read) / self._sampwidth @@ -421,6 +422,7 @@ class Wave_write: if self._sampwidth > 1 and big_endian: import array data = array.array(_array_fmts[self._sampwidth], data) + assert data.itemsize == self._sampwidth data.byteswap() data.tofile(self._file) self._datawritten = self._datawritten + len(data) * self._sampwidth diff --git a/Misc/NEWS b/Misc/NEWS index 6e4b7fb856..8af97535a5 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -35,6 +35,8 @@ Core and Builtins Library ------- +- Issue #19276: Fixed the wave module on 64-bit big-endian platforms. + - Issue #18458: Prevent crashes with newer versions of libedit. Its readline emulation has changed from 0-based indexing to 1-based like gnu readline. Original patch by Ronald Oussoren. -- 2.50.1