6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-26 08:49:37 +00:00
Code Issues Projects Releases Wiki Activity

Ensures no buffer overrun when installing the OS ROM.

Browse Source
This commit is contained in:
Thomas Harte 2018-07-10 21:49:38 -04:00
parent 57f161e64c
commit 736e14c83e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Machines/Electron/Electron.cpp
View File

@ -486,7 +486,7 @@ class ConcreteMachine:
case ROM::ADFS1: adfs1_ = data; return; case ROM::ADFS1: adfs1_ = data; return;
case ROM::ADFS2: adfs2_ = data; return; case ROM::ADFS2: adfs2_ = data; return;
case ROM::OS: target = os_; break; case ROM::OS: target = os_; return;
default: default:
target = roms_[static_cast<int>(slot)]; target = roms_[static_cast<int>(slot)];
rom_write_masks_[static_cast<int>(slot)] = is_writeable; rom_write_masks_[static_cast<int>(slot)] = is_writeable;
@ -500,7 +500,9 @@ class ConcreteMachine:
std::memcpy(&target[rom_ptr], data.data(), size_to_copy); std::memcpy(&target[rom_ptr], data.data(), size_to_copy);
rom_ptr += size_to_copy; rom_ptr += size_to_copy;
} }
rom_inserted_[static_cast<int>(slot)] = true;
if(static_cast<int>(slot) < 16)
rom_inserted_[static_cast<int>(slot)] = true;
} }
// MARK: - Work deferral updates. // MARK: - Work deferral updates.