dolphin-emu/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-10-12 02:13:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14882 from JosJuice/gci-folder-block-index

Browse Source 
GCMemcardDirectory: Add bounds check for m_save_data
This commit is contained in:
JosJuice
2026-09-21 18:23:39 +02:00
committed by GitHub
parent 42cc8c040c f8a5c5c10b
commit 22342c2303
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.cpp
+7 -1
View File
@@ -536,7 +536,7 @@ inline s32 GCMemcardDirectory::SaveAreaRW(u32 block, bool writing)
}
const int idx = m_saves[i].UsesBlock(block);
if (idx != -1)
if (idx >= 0)
{
if (!m_saves[i].LoadSaveBlocks())
{
@@ -553,6 +553,12 @@ inline s32 GCMemcardDirectory::SaveAreaRW(u32 block, bool writing)
m_saves[i].m_dirty = true;
}
if (static_cast<size_t>(idx) >= m_saves[i].m_save_data.size())
{
PanicAlertFmt("Block index ({0}) is larger than the number of available blocks ({1})",
idx, m_saves[i].m_save_data.size());
return -1;
}
m_last_block = block;
m_last_block_address = m_saves[i].m_save_data[idx].m_block.data();
return m_last_block;