Merge pull request #74 from wro-ableton/fix-wmf-eof

Fix potential integer overflow at end of stream in media_foundation_helper
NativeInstruments · Mar 1, 2024 · 319c7fe · 319c7fe
2 parents 89eb1e3 + 27b6639
commit 319c7fe
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/audiostream/src/ni/media/audio/os/win/media_foundation_helper.h b/audiostream/src/ni/media/audio/os/win/media_foundation_helper.h
@@ -65,6 +65,8 @@ template <class Source>
 class SyncronousByteStream : public IMFByteStream
 {
 
+    static constexpr auto endOfSequence = -1;
+
     auto tell() -> std::streamsize
     {
         auto pos = m_source.seek( boost::iostreams::stream_offset( 0 ), BOOST_IOS::cur );
@@ -86,7 +88,8 @@ class SyncronousByteStream : public IMFByteStream
 
         try
         {
-            *read = static_cast<ULONG>( m_source.read( reinterpret_cast<char*>( buffer ), toRead ) );
+            const auto result =  m_source.read( reinterpret_cast<char*>( buffer ), toRead );
+            *read = static_cast<ULONG>( result == endOfSequence ? 0 : result );
             return S_OK;
         }
         catch ( const std::system_error& )