[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_bndmgr.cpp,1.25,1.26

Pawel Kolodziejski aquadran at users.sourceforge.net
Sat Sep 18 06:25:04 CEST 2004


Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22451/scummvm/scumm/imuse_digi

Modified Files:
	dimuse_bndmgr.cpp 
Log Message:
workaround for decode bundle bug (it overloaded memory)

Index: dimuse_bndmgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_bndmgr.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- dimuse_bndmgr.cpp	4 Sep 2004 14:27:16 -0000	1.25
+++ dimuse_bndmgr.cpp	18 Sep 2004 13:24:02 -0000	1.26
@@ -253,15 +253,14 @@
 				output_size -= skip;
 		}
 
+		if ((output_size + skip) > 0x2000) // workaround
+			output_size -= (output_size + skip) - 0x2000;
+
 		if (output_size > size)
 			output_size = size;
 
 		assert(final_size + output_size <= blocks_final_size);
 
-		if ((skip + output_size) > 0x2000) {
-			error("skip: %d, output_size: %d, _outputSize: %d", skip, output_size, _outputSize);
-		}
-
 		memcpy(*comp_final + final_size, _compOutput + skip, output_size);
 		final_size += output_size;
 





More information about the Scummvm-git-logs mailing list