summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorAdmiral H. Curtiss <pikachu025@gmail.com>2023-12-09 15:42:15 +0100
committerAdmiral H. Curtiss <pikachu025@gmail.com>2023-12-10 14:17:37 +0100
commit7d53916466176663df7a122e664441fbcd18c080 (patch)
tree43da526d009d506512faa742d830e5b25f5ba4bb /Source/Core
parentf284bfca4597ec7f648f3a244005e051ed25cfc5 (diff)
HW/CEXIIPL: Respect bounds in LoadFileToIPL().
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp
index dddcee0077..197c0735d6 100644
--- a/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp
@@ -159,13 +159,18 @@ void CEXIIPL::DoState(PointerWrap& p)
bool CEXIIPL::LoadFileToIPL(const std::string& filename, u32 offset)
{
+ if (offset >= ROM_SIZE)
+ return false;
+
File::IOFile stream(filename, "rb");
if (!stream)
return false;
- u64 filesize = stream.GetSize();
+ const u64 filesize = stream.GetSize();
+ if (offset >= filesize)
+ return false;
- if (!stream.ReadBytes(&m_rom[offset], filesize))
+ if (!stream.ReadBytes(&m_rom[offset], std::min<u64>(filesize, ROM_SIZE) - offset))
return false;
m_fonts_loaded = true;