[OMPT-svn-commit] OpenMPT r20352 - in branches/OpenMPT-1.28: . common

[<sv...@op...>]

Author: manx
Date: Fri Mar 15 13:14:11 2024
New Revision: 20352
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20352

Log:
Merged revision(s) 20348 from branches/OpenMPT-1.29:
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.28/   (props changed)
   branches/OpenMPT-1.28/common/mptIO.cpp

Modified: branches/OpenMPT-1.28/common/mptIO.cpp
==============================================================================
--- branches/OpenMPT-1.28/common/mptIO.cpp	Fri Mar 15 13:13:46 2024	(r20351)
+++ branches/OpenMPT-1.28/common/mptIO.cpp	Fri Mar 15 13:14:11 2024	(r20352)
@@ -428,7 +428,7 @@
 
 void FileDataContainerUnseekable::EnsureCacheBuffer(std::size_t requiredbuffersize) const
 {
-	if(cache.size() >= cachesize + requiredbuffersize)
+	if(cache.size() - cachesize >= requiredbuffersize)
 	{
 		return;
 	}