Azahar-Mirror/soundtouch
1
0
Fork 0
mirror of https://github.com/azahar-emu/soundtouch synced 2025-11-07 07:30:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix CVE-2018-17097 by rounding working buffer size up to nearest 4-byte boundary. Replaced also tab characters with spaces in indentation.

Browse Source
This commit is contained in:
Olli 2018-10-28 15:51:15 +02:00
parent 59129fa33d
commit 09e04252dd
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/SoundStretch/WavFile.cpp
View File

@ -771,8 +771,8 @@ void WavOutFile::fillInHeader(uint sampleRate, uint bits, uint channels)
// fill in the 'fact' part... // fill in the 'fact' part...
memcpy(&(header.fact.fact_field), factStr, 4); memcpy(&(header.fact.fact_field), factStr, 4);
header.fact.fact_len = 4; header.fact.fact_len = 4;
header.fact.fact_sample_len = 0; header.fact.fact_sample_len = 0;
// fill in the 'data' part.. // fill in the 'data' part..
@ -788,8 +788,8 @@ void WavOutFile::finishHeader()
// supplement the file length into the header structure // supplement the file length into the header structure
header.riff.package_len = bytesWritten + sizeof(WavHeader) - sizeof(WavRiff) + 4; header.riff.package_len = bytesWritten + sizeof(WavHeader) - sizeof(WavRiff) + 4;
header.data.data_len = bytesWritten; header.data.data_len = bytesWritten;
header.fact.fact_sample_len = bytesWritten / header.format.byte_per_sample; header.fact.fact_sample_len = bytesWritten / header.format.byte_per_sample;
writeHeader(); writeHeader();
} }
@ -924,7 +924,8 @@ void WavOutFile::write(const float *buffer, int numElems)
bytesPerSample = header.format.bits_per_sample / 8; bytesPerSample = header.format.bits_per_sample / 8;
numBytes = numElems * bytesPerSample; numBytes = numElems * bytesPerSample;
short *temp = (short*)getConvBuffer(numBytes); int confBufBytes = (numBytes + 3) & -4; // round up to nearest multiple of four to avoid overflow with 24bit-value assignment
void *temp = getConvBuffer(confBufBytes);
switch (bytesPerSample) switch (bytesPerSample)
{ {