edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent integer overflow (fixes segfault in the soundengine)

Browse source
This commit is contained in:
BeaR 2014-10-29 22:45:48 +01:00
parent 0da475ea65
commit f5fa00cfb7
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/engine/client/sound.cpp
View file

@ -690,15 +690,16 @@ void CSound::SetVoiceTimeOffset(CVoiceHandle Voice, float offset)
{
if(m_aVoices[VoiceID].m_pSample)
{
int TickOffset = m_aVoices[VoiceID].m_pSample->m_Rate * offset;
int Tick = 0;
uint64_t TickOffset = m_aVoices[VoiceID].m_pSample->m_Rate * offset;
if(m_aVoices[VoiceID].m_pSample->m_NumFrames > 0 && m_aVoices[VoiceID].m_Flags&ISound::FLAG_POS)
TickOffset = TickOffset % m_aVoices[VoiceID].m_pSample->m_NumFrames;
Tick = TickOffset % m_aVoices[VoiceID].m_pSample->m_NumFrames;
else
TickOffset = clamp(TickOffset, 0, m_aVoices[VoiceID].m_pSample->m_NumFrames);
Tick = clamp(TickOffset, (uint64_t)0, (uint64_t)m_aVoices[VoiceID].m_pSample->m_NumFrames);
// at least 2sec off
if(abs(m_aVoices[VoiceID].m_Tick-TickOffset) > 2*m_aVoices[VoiceID].m_pSample->m_Rate)
m_aVoices[VoiceID].m_Tick = TickOffset;
if(abs(m_aVoices[VoiceID].m_Tick-Tick) > 2*m_aVoices[VoiceID].m_pSample->m_Rate)
m_aVoices[VoiceID].m_Tick = Tick;
}
}
lock_release(m_SoundLock);