[OMPT-svn-commit] OpenMPT r25816 - in branches/OpenMPT-1.30: . soundlib

[<sv...@op...>]

Author: sagamusix
Date: Sun Oct 25 18:28:56 2026
New Revision: 25816
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=25816

Log:
Merged revision(s) 25811-25813 from trunk/OpenMPT:
[Fix] WAV: It was possible that a fact chunk claimed an impossibly big sample length for an IMA ADPCM sample, causing unnecessarily large memory allocations.
........
[Fix] WAV: Also sanitize IMA ADPCM sample length for mono samples.
........
[Fix] WAV: Avoid sample length claimed by fact chunk to remain unsanitized when other conditions already determine that the IMA ADPCM parameters are invalid. It would still cause memory to be allocated.
........

Modified:
   branches/OpenMPT-1.30/   (props changed)
   branches/OpenMPT-1.30/soundlib/WAVTools.cpp

Modified: branches/OpenMPT-1.30/soundlib/WAVTools.cpp
==============================================================================
--- branches/OpenMPT-1.30/soundlib/WAVTools.cpp	Sun Oct 25 18:28:22 2026	(r25815)
+++ branches/OpenMPT-1.30/soundlib/WAVTools.cpp	Sun Oct 25 18:28:56 2026	(r25816)
@@ -104,11 +104,12 @@
 		sampleData = chunks.GetChunk(RIFFChunk::idpcm_);
 	}
 
-	// "fact" chunk should contain sample length of compressed samples.
-	sampleLength = chunks.GetChunk(RIFFChunk::idfact).ReadUint32LE();
-
-	if((formatInfo.format == WAVFormatChunk::fmtIMA_ADPCM) && (GetBlockAlign() > 0))
+	sampleLength = 0;
+	if((formatInfo.format == WAVFormatChunk::fmtIMA_ADPCM) && (GetBlockAlign() >= 4 * formatInfo.numChannels))
 	{
+		// "fact" chunk should contain sample length of compressed samples.
+		sampleLength = chunks.GetChunk(RIFFChunk::idfact).ReadUint32LE();
+
 		FileReader::pos_type dataLength = sampleData.GetLength();
 		std::size_t blocks = mpt::align_up<FileReader::pos_type>(dataLength, GetBlockAlign()) / GetBlockAlign();
 		std::size_t framesPerBlock = ((GetBlockAlign() - (4 * formatInfo.numChannels)) * 2 / formatInfo.numChannels) + 1;
@@ -124,6 +125,7 @@
 				sampleLength *= 2;
 			}
 		}
+		LimitMax(sampleLength, expectedLengthFrames);
 	}
 
 	if((formatInfo.format != WAVFormatChunk::fmtIMA_ADPCM || sampleLength == 0) && GetSampleSize() != 0)