[OMPT-svn-commit] OpenMPT r20339 - in branches/OpenMPT-1.31: . src/mpt/io_read

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

Author: manx
Date: Fri Mar 15 12:43:37 2024
New Revision: 20339
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20339

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.31/   (props changed)
   branches/OpenMPT-1.31/src/mpt/io_read/filedata_base_unseekable.hpp

Modified: branches/OpenMPT-1.31/src/mpt/io_read/filedata_base_unseekable.hpp
==============================================================================
--- branches/OpenMPT-1.31/src/mpt/io_read/filedata_base_unseekable.hpp	Fri Mar 15 12:43:12 2024	(r20338)
+++ branches/OpenMPT-1.31/src/mpt/io_read/filedata_base_unseekable.hpp	Fri Mar 15 12:43:37 2024	(r20339)
@@ -50,7 +50,7 @@
 	};
 
 	void EnsureCacheBuffer(std::size_t requiredbuffersize) const {
-		if (cache.size() >= cachesize + requiredbuffersize) {
+		if (cache.size() - cachesize >= requiredbuffersize) {
 			return;
 		}
 		if (cache.size() == 0) {