diff options
| author | Florian Kagerer | 2010-10-08 13:50:11 +0000 |
|---|---|---|
| committer | Florian Kagerer | 2010-10-08 13:50:11 +0000 |
| commit | 4ad65e5179c4ad5bf71d2bba3eaaeebf9fcef211 (patch) | |
| tree | 3c73ad59fe6f9a5456ad4d91eca17e0903ef8178 /engines | |
| parent | 744a1829ac4927d2b30fc6ca8c2c064ec7bb6091 (diff) | |
| download | scummvm-rg350-4ad65e5179c4ad5bf71d2bba3eaaeebf9fcef211.tar.gz scummvm-rg350-4ad65e5179c4ad5bf71d2bba3eaaeebf9fcef211.tar.bz2 scummvm-rg350-4ad65e5179c4ad5bf71d2bba3eaaeebf9fcef211.zip | |
SCUMM/FM-TOWNS: fixed possible invalid mem access in sfx code
svn-id: r53073
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/player_towns.cpp | 13 | ||||
| -rw-r--r-- | engines/scumm/player_towns.h | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/engines/scumm/player_towns.cpp b/engines/scumm/player_towns.cpp index 05c9c0ec68..fa19cb20fd 100644 --- a/engines/scumm/player_towns.cpp +++ b/engines/scumm/player_towns.cpp @@ -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]; diff --git a/engines/scumm/player_towns.h b/engines/scumm/player_towns.h index 1ec7cc515e..6916655899 100644 --- a/engines/scumm/player_towns.h +++ b/engines/scumm/player_towns.h @@ -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; |