ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

SCUMM/FM-TOWNS: fixed possible invalid mem access in sfx code

Browse Source 
svn-id: r53073
This commit is contained in:
Florian Kagerer
2010-10-08 13:50:11 +00:00
parent 744a1829ac
commit 4ad65e5179
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/scumm/player_towns.cpp
+6 -7
View File
@@ -118,7 +118,7 @@ void Player_Towns::playPcmTrack(int sound, const uint8 *data, int velo, int pan,
int numChan = _v2 ? 1 : ptr[14];
for (int i = 0; i < numChan; i++) {
int chan = getNextFreePcmChannel(sound, i, priority);
int chan = allocatePcmChannel(sound, i, priority);
if (!chan)
return;
@@ -156,7 +156,7 @@ void Player_Towns::stopPcmTrack(int sound) {
}
}
int Player_Towns::getNextFreePcmChannel(int sound, int sfxChanRelIndex, uint32 priority) {
int Player_Towns::allocatePcmChannel(int sound, int sfxChanRelIndex, uint32 priority) {
if (!_intf)
return 0;
@@ -177,7 +177,8 @@ int Player_Towns::getNextFreePcmChannel(int sound, int sfxChanRelIndex, uint32 p
continue;
chan = i;
_vm->_sound->stopSound(_pcmCurrentSound[chan].index);
if (_pcmCurrentSound[chan].index != 0xffff)
_vm->_sound->stopSound(_pcmCurrentSound[chan].index);
}
if (!chan) {
@@ -185,7 +186,7 @@ int Player_Towns::getNextFreePcmChannel(int sound, int sfxChanRelIndex, uint32 p
if (priority >= _pcmCurrentSound[i].priority)
chan = i;
}
if (chan)
if (chan && _pcmCurrentSound[chan].index != 0xffff)
_vm->_sound->stopSound(_pcmCurrentSound[chan].index);
}
}
@@ -723,9 +724,7 @@ void Player_Towns_v2::playPcmTrackSBL(const uint8 *data) {
uint32 len = (READ_LE_UINT32(data) >> 8) - 2;
int chan = getNextFreePcmChannel(0xffff, 0, 0x1000);
if (!chan)
return;
int chan = allocatePcmChannel(0xffff, 0, 0x1000);
delete[] _sblData;
_sblData = new uint8[len + 32];
engines/scumm/player_towns.h
+1 -1
View File
@@ -59,7 +59,7 @@ protected:
void playPcmTrack(int sound, const uint8 *data, int velo = 0, int pan = 64, int note = 0, int priority = 0);
void stopPcmTrack(int sound);
int getNextFreePcmChannel(int sound, int sfxChanRelIndex, uint32 priority);
int allocatePcmChannel(int sound, int sfxChanRelIndex, uint32 priority);
struct PcmCurrentSound {
uint16 index;