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

ni-mheppner · web-flow · commit 319c7fe5363b · 2024-03-01T17:39:27.000+01:00
Fix potential integer overflow at end of stream in media_foundation_helper
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& )

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,8 @@ template <class Source>`
`65`	`65`	`class SyncronousByteStream : public IMFByteStream`
`66`	`66`	`{`
`67`	`67`
	`68`	`+ static constexpr auto endOfSequence = -1;`
	`69`	`+`
`68`	`70`	`auto tell() -> std::streamsize`
`69`	`71`	`{`
`70`	`72`	`auto pos = m_source.seek( boost::iostreams::stream_offset( 0 ), BOOST_IOS::cur );`
`@@ -86,7 +88,8 @@ class SyncronousByteStream : public IMFByteStream`
`86`	`88`
`87`	`89`	`try`
`88`	`90`	`{`
`89`		`- read = static_cast<ULONG>( m_source.read( reinterpret_cast<char>( buffer ), toRead ) );`
	`91`	`+ const auto result = m_source.read( reinterpret_cast<char*>( buffer ), toRead );`
	`92`	`+ *read = static_cast<ULONG>( result == endOfSequence ? 0 : result );`
`90`	`93`	`return S_OK;`
`91`	`94`	`}`
`92`	`95`	`catch ( const std::system_error& )`