Catch issue where the number of samples in the metadata is larger tha…

…n the actual file data
adamstark · Jan 17, 2021 · c9ebb00 · c9ebb00
1 parent 829508c
commit c9ebb00
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/AudioFile.h b/AudioFile.h
@@ -564,6 +564,12 @@ bool AudioFile<T>::decodeWaveFile (std::vector<uint8_t>& fileData)
         {
             int sampleIndex = samplesStartIndex + (numBytesPerBlock * i) + channel * numBytesPerSample;
 
+            if ((sampleIndex + (bitDepth / 8)) >= fileData.size())
+            {
+                reportError ("ERROR: read file error as the metadata indicates more samples than there are in the file data");
+                return false;
+            }
+
             if (bitDepth == 8)
             {
                 T sample = singleByteToSample (fileData[sampleIndex]);
@@ -702,6 +708,12 @@ bool AudioFile<T>::decodeAiffFile (std::vector<uint8_t>& fileData)
         {
             int sampleIndex = samplesStartIndex + (numBytesPerFrame * i) + channel * numBytesPerSample;
 
+            if ((sampleIndex + (bitDepth / 8)) >= fileData.size())
+            {
+                reportError ("ERROR: read file error as the metadata indicates more samples than there are in the file data");
+                return false;
+            }
+
             if (bitDepth == 8)
             {
                 int8_t sampleAsSigned8Bit = (int8_t)fileData[sampleIndex];