Commit 71378032 authored by Serhiy Storchaka's avatar Serhiy Storchaka

Issue #19276: Fixed the wave module on 64-bit big-endian platforms.

parent cea38084
...@@ -80,7 +80,7 @@ class Error(Exception): ...@@ -80,7 +80,7 @@ class Error(Exception):
WAVE_FORMAT_PCM = 0x0001 WAVE_FORMAT_PCM = 0x0001
_array_fmts = None, 'b', 'h', None, 'l' _array_fmts = None, 'b', 'h', None, 'i'
# Determine endian-ness # Determine endian-ness
import struct import struct
...@@ -238,6 +238,7 @@ class Wave_read: ...@@ -238,6 +238,7 @@ class Wave_read:
import array import array
chunk = self._data_chunk chunk = self._data_chunk
data = array.array(_array_fmts[self._sampwidth]) data = array.array(_array_fmts[self._sampwidth])
assert data.itemsize == self._sampwidth
nitems = nframes * self._nchannels nitems = nframes * self._nchannels
if nitems * self._sampwidth > chunk.chunksize - chunk.size_read: if nitems * self._sampwidth > chunk.chunksize - chunk.size_read:
nitems = (chunk.chunksize - chunk.size_read) / self._sampwidth nitems = (chunk.chunksize - chunk.size_read) / self._sampwidth
...@@ -421,6 +422,7 @@ class Wave_write: ...@@ -421,6 +422,7 @@ class Wave_write:
if self._sampwidth > 1 and big_endian: if self._sampwidth > 1 and big_endian:
import array import array
data = array.array(_array_fmts[self._sampwidth], data) data = array.array(_array_fmts[self._sampwidth], data)
assert data.itemsize == self._sampwidth
data.byteswap() data.byteswap()
data.tofile(self._file) data.tofile(self._file)
self._datawritten = self._datawritten + len(data) * self._sampwidth self._datawritten = self._datawritten + len(data) * self._sampwidth
......
...@@ -35,6 +35,8 @@ Core and Builtins ...@@ -35,6 +35,8 @@ Core and Builtins
Library Library
------- -------
- Issue #19276: Fixed the wave module on 64-bit big-endian platforms.
- Issue #18458: Prevent crashes with newer versions of libedit. Its readline - Issue #18458: Prevent crashes with newer versions of libedit. Its readline
emulation has changed from 0-based indexing to 1-based like gnu readline. emulation has changed from 0-based indexing to 1-based like gnu readline.
Original patch by Ronald Oussoren. Original patch by Ronald Oussoren.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment