github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-06-08 04:25:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cheats: Add bounds check to 5107/5147

Browse Source
This commit is contained in:
Stenzek 2025-01-11 12:40:46 +10:00
parent c98dbb9d9e
commit 93a7e7cef5
No known key found for this signature in database
1 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/core/cheats.cpp
View File

@ -2833,18 +2833,21 @@ void Cheats::GamesharkCheatCode::Apply() const
cht_register[cht_reg_no1] = DoMemoryRead<u8>(cht_register[cht_reg_no2] + poke_value); cht_register[cht_reg_no1] = DoMemoryRead<u8>(cht_register[cht_reg_no2] + poke_value);
break; break;
case 0x07: // Write the u8 poke_value to a specific index of a single array in a series of consecutive arrays case 0x07: // Write the u8 poke_value to a specific index of a single array in a series of consecutive arrays
//This cheat type requires a separate cheat to set up 4 consecutive cht_arrays before this will work // This cheat type requires a separate cheat to set up 4 consecutive cht_arrays before this will work
//cht_register[cht_reg_no1] = the base address of the first element of the first array // cht_register[cht_reg_no1] = the base address of the first element of the first array
//cht_register[cht_reg_no1+1] = the array size (basically the address diff between the start of each array) // cht_register[cht_reg_no1+1] = the array size (basically the address diff between the start of each array)
//cht_register[cht_reg_no1+2] = the index of which array in the series to poke (this must be greater than 0) // cht_register[cht_reg_no1+2] = the index of which array in the series to poke (this must be greater than
//cht_register[cht_reg_no1+3] must == 0xD0D0 to ensure it only pokes when the above cht_regs have been set // 0) cht_register[cht_reg_no1+3] must == 0xD0D0 to ensure it only pokes when the above cht_regs have been
// set
// (safety valve) // (safety valve)
//cht_offset = the index of the individual array to change (so must be 0 to cht_register[cht_reg_no1+1]) // cht_offset = the index of the individual array to change (so must be 0 to cht_register[cht_reg_no1+1])
if (cht_register[cht_reg_no1 + 3] == 0xD0D0 && cht_register[cht_reg_no1 + 2] > 0 if ((cht_reg_no1 <= (std::size(cht_register) - 4)) && cht_register[cht_reg_no1 + 3] == 0xD0D0 &&
&& cht_register[cht_reg_no1 + 1] >= cht_offset) cht_register[cht_reg_no1 + 2] > 0 && cht_register[cht_reg_no1 + 1] >= cht_offset)
{
DoMemoryWrite<u8>((cht_register[cht_reg_no1] - cht_register[cht_reg_no1 + 1]) + DoMemoryWrite<u8>((cht_register[cht_reg_no1] - cht_register[cht_reg_no1 + 1]) +
(cht_register[cht_reg_no1 + 1] * cht_register[cht_reg_no1 + 2]) + cht_offset, (cht_register[cht_reg_no1 + 1] * cht_register[cht_reg_no1 + 2]) + cht_offset,
Truncate8(poke_value & 0xFFu)); Truncate8(poke_value & 0xFFu));
}
break; break;
case 0x40: // Write the u16 from cht_register[cht_reg_no1] to address case 0x40: // Write the u16 from cht_register[cht_reg_no1] to address
@ -2874,18 +2877,21 @@ void Cheats::GamesharkCheatCode::Apply() const
cht_register[cht_reg_no1] = DoMemoryRead<u16>(cht_register[cht_reg_no2] + poke_value); cht_register[cht_reg_no1] = DoMemoryRead<u16>(cht_register[cht_reg_no2] + poke_value);
break; break;
case 0x47: // Write the u16 poke_value to a specific index of a single array in a series of consecutive arrays case 0x47: // Write the u16 poke_value to a specific index of a single array in a series of consecutive arrays
//This cheat type requires a separate cheat to set up 4 consecutive cht_arrays before this will work // This cheat type requires a separate cheat to set up 4 consecutive cht_arrays before this will work
//cht_register[cht_reg_no1] = the base address of the first element of the first array // cht_register[cht_reg_no1] = the base address of the first element of the first array
//cht_register[cht_reg_no1+1] = the array size (basically the address diff between the start of each array) // cht_register[cht_reg_no1+1] = the array size (basically the address diff between the start of each array)
//cht_register[cht_reg_no1+2] = the index of which array in the series to poke (this must be greater than 0) // cht_register[cht_reg_no1+2] = the index of which array in the series to poke (this must be greater than
//cht_register[cht_reg_no1+3] must == 0xD0D0 to ensure it only pokes when the above cht_regs have been set // 0) cht_register[cht_reg_no1+3] must == 0xD0D0 to ensure it only pokes when the above cht_regs have been
// set
// (safety valve) // (safety valve)
//cht_offset = the index of the individual array to change (so must be 0 to cht_register[cht_reg_no1+1]) // cht_offset = the index of the individual array to change (so must be 0 to cht_register[cht_reg_no1+1])
if (cht_register[cht_reg_no1 + 3] == 0xD0D0 && cht_register[cht_reg_no1 + 2] > 0 if ((cht_reg_no1 <= (std::size(cht_register) - 4)) && cht_register[cht_reg_no1 + 3] == 0xD0D0 &&
&& cht_register[cht_reg_no1 + 1] >= cht_offset) cht_register[cht_reg_no1 + 2] > 0 && cht_register[cht_reg_no1 + 1] >= cht_offset)
{
DoMemoryWrite<u16>((cht_register[cht_reg_no1] - cht_register[cht_reg_no1 + 1]) + DoMemoryWrite<u16>((cht_register[cht_reg_no1] - cht_register[cht_reg_no1 + 1]) +
(cht_register[cht_reg_no1 + 1] * cht_register[cht_reg_no1 + 2]) + cht_offset, (cht_register[cht_reg_no1 + 1] * cht_register[cht_reg_no1 + 2]) + cht_offset,
Truncate16(poke_value & 0xFFFFu)); Truncate16(poke_value & 0xFFFFu));
}
break; break;
case 0x80: // Write the u32 from cht_register[cht_reg_no1] to address case 0x80: // Write the u32 from cht_register[cht_reg_no1] to address
@ -2912,7 +2918,7 @@ void Cheats::GamesharkCheatCode::Apply() const
// cht_register[cht_reg_no1] // cht_register[cht_reg_no1]
cht_register[cht_reg_no1] = DoMemoryRead<u32>(cht_register[cht_reg_no2] + poke_value); cht_register[cht_reg_no1] = DoMemoryRead<u32>(cht_register[cht_reg_no2] + poke_value);
break; break;
//Do not use 0x87 as it's not possible to duplicate 0x07, 0x47 for a 32 bit write as not enough characters // Do not use 0x87 as it's not possible to duplicate 0x07, 0x47 for a 32 bit write as not enough characters
case 0xC0: // Reg3 = Reg2 + Reg1 case 0xC0: // Reg3 = Reg2 + Reg1
cht_register[cht_reg_no3] = cht_register[cht_reg_no2] + cht_register[cht_reg_no1]; cht_register[cht_reg_no3] = cht_register[cht_reg_no2] + cht_register[cht_reg_no1];