Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-02-17 03:15:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Timers: Don't read out of bounds for invalid address

Browse source
This commit is contained in:
Connor McLaughlin 2020-08-23 14:03:36 +10:00
parent 60eb22537b
commit 32921acc5a
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/core/timers.cpp
View file

@ -177,6 +177,11 @@ u32 Timers::ReadRegister(u32 offset)
{ {
const u32 timer_index = (offset >> 4) & u32(0x03); const u32 timer_index = (offset >> 4) & u32(0x03);
const u32 port_offset = offset & u32(0x0F); const u32 port_offset = offset & u32(0x0F);
if (timer_index >= 3)
{
Log_ErrorPrintf("Timer read out of range: offset 0x%02X", offset);
return UINT32_C(0xFFFFFFFF);
}
CounterState& cs = m_states[timer_index]; CounterState& cs = m_states[timer_index];
@ -226,6 +231,11 @@ void Timers::WriteRegister(u32 offset, u32 value)
{ {
const u32 timer_index = (offset >> 4) & u32(0x03); const u32 timer_index = (offset >> 4) & u32(0x03);
const u32 port_offset = offset & u32(0x0F); const u32 port_offset = offset & u32(0x0F);
if (timer_index >= 3)
{
Log_ErrorPrintf("Timer write out of range: offset 0x%02X value 0x%08X", offset, value);
return;
}
CounterState& cs = m_states[timer_index]; CounterState& cs = m_states[timer_index];