AudioFormatReaderSource: Avoid reading past the end of the wrapped Au…

…dioFormatReader
juce-framework · Jan 25, 2023 · c56102f · c56102f
1 parent 273275c
commit c56102f
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/modules/juce_audio_formats/format/juce_AudioFormatReaderSource.cpp b/modules/juce_audio_formats/format/juce_AudioFormatReaderSource.cpp
@@ -81,8 +81,14 @@ void AudioFormatReaderSource::getNextAudioBlock (const AudioSourceChannelInfo& i
         }
         else
         {
-            reader->read (info.buffer, info.startSample,
-                          info.numSamples, start, true, true);
+            const auto samplesToRead = jlimit (int64{},
+                                               (int64) info.numSamples,
+                                               reader->lengthInSamples - start);
+
+            reader->read (info.buffer, info.startSample, (int) samplesToRead, start, true, true);
+            info.buffer->clear ((int) (info.startSample + samplesToRead),
+                                (int) (info.numSamples - samplesToRead));
+
             nextPlayPos += info.numSamples;
         }
     }