[Scummvm-cvs-logs] CVS: scummvm/scumm bundle.cpp,1.30,1.31

Pawel Kolodziejski aquadran at users.sourceforge.net
Sat Mar 8 10:57:05 CET 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv2304

Modified Files:
	bundle.cpp 
Log Message:
hack for comi bundle codec, i hope it fix valgrid warnings

Index: bundle.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/bundle.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- bundle.cpp	7 Mar 2003 07:49:10 -0000	1.30
+++ bundle.cpp	8 Mar 2003 18:51:07 -0000	1.31
@@ -276,7 +276,9 @@
 	*comp_final = (byte *)malloc(0x2000 * num);
 
 	for (i = 0; i < num; i++) {
-		comp_input = (byte *)malloc(_compVoiceTable[i].size);
+		// CMI hack: one more zero byte at the end of input buffer
+		comp_input = (byte *)malloc(_compVoiceTable[i].size + 1);
+		comp_input[_compVoiceTable[i].size] = 0;
 
 		_voiceFile.seek(_bundleVoiceTable[index].offset + _compVoiceTable[i].offset, SEEK_SET);
 		_voiceFile.read(comp_input, _compVoiceTable[i].size);
@@ -329,7 +331,9 @@
 		_lastSong = index;
 	}
 
-	comp_input = (byte *)malloc(_compMusicTable[number].size);
+	// CMI hack: one more zero byte at the end of input buffer
+	comp_input = (byte *)malloc(_compMusicTable[number].size + 1);
+	comp_input[_compMusicTable[number].size] = 0;
 
 	_musicFile.seek(_bundleMusicTable[index].offset + _compMusicTable[number].offset, SEEK_SET);
 	_musicFile.read(comp_input, _compMusicTable[number].size);





More information about the Scummvm-git-logs mailing list