From: <sv...@op...> - 2024-03-15 12:07:19
|
Author: manx Date: Fri Mar 15 13:07:05 2024 New Revision: 20348 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20348 Log: Merged revision(s) 20333 from trunk/OpenMPT: [Fix] mpt/io_read/filedata_base_unseekable.hpp: Avoid integer overflow in EnsureCacheBuffer() when reading unseekable files are close to uint32_max in size. ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/common/mptIO.cpp Modified: branches/OpenMPT-1.29/common/mptIO.cpp ============================================================================== --- branches/OpenMPT-1.29/common/mptIO.cpp Fri Mar 15 13:00:49 2024 (r20347) +++ branches/OpenMPT-1.29/common/mptIO.cpp Fri Mar 15 13:07:05 2024 (r20348) @@ -354,7 +354,7 @@ void FileDataContainerUnseekable::EnsureCacheBuffer(std::size_t requiredbuffersize) const { - if(cache.size() >= cachesize + requiredbuffersize) + if(cache.size() - cachesize >= requiredbuffersize) { return; } |