Merge pull request #99 from zhouchanglin-rr/master

adamstark · web-flow · commit ee1a08e43be5 · 2025-10-15T21:21:55.000+01:00
Fix integer overflow issue.
diff --git a/AudioFile.h b/AudioFile.h
@@ -636,7 +636,7 @@ bool AudioFile<T>::decodeWaveFile (const std::vector<uint8_t>& fileData)
     {
         for (int channel = 0; channel < numChannels; channel++)
         {
-            int sampleIndex = samplesStartIndex + (numBytesPerBlock * i) + channel * numBytesPerSample;
+            size_t sampleIndex = samplesStartIndex + (numBytesPerBlock * i) + channel * numBytesPerSample;
             
             if ((sampleIndex + (bitDepth / 8) - 1) >= fileData.size())
             {
@@ -797,7 +797,7 @@ bool AudioFile<T>::decodeAiffFile (const std::vector<uint8_t>& fileData)
     {
         for (int channel = 0; channel < numChannels; channel++)
         {
-            int sampleIndex = samplesStartIndex + (numBytesPerFrame * i) + channel * numBytesPerSample;
+            size_t sampleIndex = samplesStartIndex + (numBytesPerFrame * i) + channel * numBytesPerSample;
             
             if ((sampleIndex + (bitDepth / 8) - 1) >= fileData.size())
             {

Original file line number	Diff line number	Diff line change
`@@ -636,7 +636,7 @@ bool AudioFile<T>::decodeWaveFile (const std::vector<uint8_t>& fileData)`
`636`	`636`	`{`
`637`	`637`	`for (int channel = 0; channel < numChannels; channel++)`
`638`	`638`	`{`
`639`		`- int sampleIndex = samplesStartIndex + (numBytesPerBlock * i) + channel * numBytesPerSample;`
	`639`	`+ size_t sampleIndex = samplesStartIndex + (numBytesPerBlock * i) + channel * numBytesPerSample;`
`640`	`640`
`641`	`641`	`if ((sampleIndex + (bitDepth / 8) - 1) >= fileData.size())`
`642`	`642`	`{`
`@@ -797,7 +797,7 @@ bool AudioFile<T>::decodeAiffFile (const std::vector<uint8_t>& fileData)`
`797`	`797`	`{`
`798`	`798`	`for (int channel = 0; channel < numChannels; channel++)`
`799`	`799`	`{`
`800`		`- int sampleIndex = samplesStartIndex + (numBytesPerFrame * i) + channel * numBytesPerSample;`
	`800`	`+ size_t sampleIndex = samplesStartIndex + (numBytesPerFrame * i) + channel * numBytesPerSample;`
`801`	`801`
`802`	`802`	`if ((sampleIndex + (bitDepth / 8) - 1) >= fileData.size())`
`803`	`803`	`{`