Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix yet another division by 0 when parsing WAV data

Browse Source 
Ensure that the size of one sample (including all the channels) is non
zero before dividing by it.
This commit is contained in:
Vadim Zeitlin
2017-12-30 17:45:01 +01:00
parent 932f384c87
commit 61c7cf9a9c
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/unix/sound.cpp
View File

@@ -673,6 +673,13 @@ bool wxSound::LoadWAV(const void* data_, size_t length, bool copyData)
waveformat.ulSamplesPerSec * waveformat.uiBlockAlign) waveformat.ulSamplesPerSec * waveformat.uiBlockAlign)
return false; return false;
// We divide by this number below to obtain the number of samples, so it
// definitely can't be 0.
wxUint32 const sampleSize =
waveformat.uiChannels * waveformat.uiBitsPerSample / 8;
if (!sampleSize)
return false;
// get file size from header // get file size from header
wxUint32 chunkSize; wxUint32 chunkSize;
memcpy(&chunkSize, &data[4], 4); memcpy(&chunkSize, &data[4], 4);
@@ -695,7 +702,7 @@ bool wxSound::LoadWAV(const void* data_, size_t length, bool copyData)
m_data->m_channels = waveformat.uiChannels; m_data->m_channels = waveformat.uiChannels;
m_data->m_samplingRate = waveformat.ulSamplesPerSec; m_data->m_samplingRate = waveformat.ulSamplesPerSec;
m_data->m_bitsPerSample = waveformat.uiBitsPerSample; m_data->m_bitsPerSample = waveformat.uiBitsPerSample;
m_data->m_samples = ul / (m_data->m_channels * m_data->m_bitsPerSample / 8); m_data->m_samples = ul / sampleSize;
m_data->m_dataBytes = ul; m_data->m_dataBytes = ul;
if (copyData) if (copyData)