[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_mixer.cpp,1.26,1.27 smush_player.cpp,1.89,1.90

Max Horn fingolfin at users.sourceforge.net
Thu Dec 25 16:45:01 CET 2003


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

Modified Files:
	smush_mixer.cpp smush_player.cpp 
Log Message:
I got some buffer overflow warnings, seems 200KB isn't quite enough...

Index: smush_mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_mixer.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- smush_mixer.cpp	24 Dec 2003 17:42:20 -0000	1.26
+++ smush_mixer.cpp	26 Dec 2003 00:44:01 -0000	1.27
@@ -120,7 +120,7 @@
 
 				if (_mixer->isReady()) {
 					if (!_channels[i].handle.isActive())
-						_mixer->newStream(&_channels[i].handle, rate, flags, 500000);
+						_mixer->newStream(&_channels[i].handle, rate, flags, 400000);
 					_mixer->appendStream(_channels[i].handle, data, size);
 				}
 				free(data);

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- smush_player.cpp	25 Dec 2003 21:33:30 -0000	1.89
+++ smush_player.cpp	26 Dec 2003 00:44:01 -0000	1.90
@@ -455,7 +455,7 @@
 					} while (--count);
 
 					if (!_IACTchannel.isActive())
-						_scumm->_mixer->newStream(&_IACTchannel, 22050, SoundMixer::FLAG_STEREO | SoundMixer::FLAG_16BITS, 200000);
+						_scumm->_mixer->newStream(&_IACTchannel, 22050, SoundMixer::FLAG_STEREO | SoundMixer::FLAG_16BITS, 400000);
 					_scumm->_mixer->appendStream(_IACTchannel, output_data, 0x1000);
 
 					bsize -= len;





More information about the Scummvm-git-logs mailing list