dolphin-emu/dolphin
1
0
Fork 1
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-08-03 20:24:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14747 from AdmiralCurtiss/dsp-hle-oob

Browse Source 
HW/DSPHLE/AXVoice: Check array bounds in ApplyUpdatesForMs()
This commit is contained in:
Scott Mansell
2026-07-29 13:26:27 +12:00
committed by GitHub
parent 443094f020 af38db4a23
commit 475f35e2fa
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/Core/HW/DSPHLE/UCodes/AXVoice.h
+13 -8
View File
@@ -59,21 +59,26 @@ PBUpdateData LoadPBUpdates(Memory::MemoryManager& memory, const PB_TYPE& pb)
// Apply updates to a PB.
void ApplyUpdatesForMs(int curr_ms, PB_TYPE& pb, u16* num_updates, const PBUpdateData& updates)
{
auto pb_mem = Common::BitCastToArray<u16>(pb);
u32 start_idx = 0;
for (int i = 0; i < curr_ms; ++i)
start_idx += num_updates[i];
for (u32 i = start_idx; i < start_idx + num_updates[curr_ms]; ++i)
if (start_idx < updates.size())
{
u16 update_off = updates[i].pb_offset;
u16 update_val = updates[i].new_value;
const u16 count = num_updates[curr_ms];
if (count <= updates.size() - start_idx)
{
const u32 end_idx = start_idx + count;
for (u32 i = start_idx; i < end_idx; ++i)
{
const u16 update_off = updates[i].pb_offset;
const u16 update_val = updates[i].new_value;
pb_mem[update_off] = update_val;
if (update_off < (sizeof(pb) / sizeof(u16)))
Common::BitCastPtr<u16>(&pb)[update_off] = update_val;
}
}
}
pb = std::bit_cast<PB_TYPE>(pb_mem);
}
// Used to pass a large amount of buffers to the mixing function.