zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 17:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add checks for invalid sound that can cause crash

Browse source
This commit is contained in:
nukeykt 2019-11-14 04:28:17 +09:00 committed by Christoph Oelckers
parent 7095abf5c1
commit e4c1d0e7c8
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
source/exhumed/src/sound.cpp
View file

@ -821,7 +821,7 @@ void UpdateSounds()
void UpdateCreepySounds()
{
if (levelnum == 20)
if (levelnum == 20 || nFreeze)
return;
spritetype *pSprite = &sprite[PlayerList[nLocalPlayer].nSprite];
nCreepyTimer--;
@ -893,6 +893,12 @@ void PlaySound(int nSound)
if (!dig)
return;
if (nSound < 0 || nSound >= kMaxSounds || !SoundBuf[nSound])
{
initprintf("PlaySound: Invalid sound nSound == %i\n", nSound);
return;
}
int bLoop = SoundBuf[nSound][26] == 6;
if (handle >= 0)
@ -917,6 +923,12 @@ void PlayLocalSound(short nSound, short nRate)
if (!dig)
return;
if (nSound < 0 || nSound >= kMaxSounds || !SoundBuf[nSound])
{
initprintf("PlayLocalSound: Invalid sound nSound == %i, nRate == %i\n", nSound, nRate);
return;
}
if (nLocalChan == nAmbientChannel)
nAmbientChannel = -1;
@ -974,6 +986,12 @@ short PlayFX2(unsigned short nSound, short nSprite)
if (!dig)
return -1;
if (nSound < 0 || nSound >= kMaxSounds || !SoundBuf[nSound])
{
initprintf("PlayFX2: Invalid sound nSound == %i, nSprite == %i\n", nSound, nSprite);
return -1;
}
nLocalSectFlags = SectFlag[nPlayerViewSect[nLocalPlayer]];
short v1c;
short vcx;