6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-08-07 23:25:00 +00:00
Code Issues Projects Releases Wiki Activity

Ensures no out-of-disk-bounds mirroring.

Browse Source
This commit is contained in:
Thomas Harte
2019-11-12 23:22:25 -05:00
parent 4ec8fa0d20
commit e8e166eec5
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Storage/Disk/DiskImage/Formats/MFMSectorDump.cpp
View File

@@ -22,10 +22,11 @@ void MFMSectorDump::set_geometry(int sectors_per_track, uint8_t sector_size, uin
} }
std::shared_ptr<Track> MFMSectorDump::get_track_at_position(Track::Address address) { std::shared_ptr<Track> MFMSectorDump::get_track_at_position(Track::Address address) {
uint8_t sectors[(128 << sector_size_)*sectors_per_track_]; if(address.head >= get_head_count()) return nullptr;
if(address.position.as_largest() >= get_maximum_head_position().as_largest()) return nullptr;
if(address.head > 1) return nullptr; uint8_t sectors[(128 << sector_size_)*sectors_per_track_];
long file_offset = get_file_offset_for_position(address); const long file_offset = get_file_offset_for_position(address);
{ {
std::lock_guard<std::mutex> lock_guard(file_.get_file_access_mutex()); std::lock_guard<std::mutex> lock_guard(file_.get_file_access_mutex());
@@ -45,7 +46,7 @@ void MFMSectorDump::set_tracks(const std::map<Track::Address, std::shared_ptr<Tr
for(const auto &track : tracks) { for(const auto &track : tracks) {
// Assumption here: sector IDs will run from 0. // Assumption here: sector IDs will run from 0.
decode_sectors(*track.second, parsed_track, first_sector_, first_sector_ + static_cast<uint8_t>(sectors_per_track_-1), sector_size_, is_double_density_); decode_sectors(*track.second, parsed_track, first_sector_, first_sector_ + static_cast<uint8_t>(sectors_per_track_-1), sector_size_, is_double_density_);
long file_offset = get_file_offset_for_position(track.first); const long file_offset = get_file_offset_for_position(track.first);
std::lock_guard<std::mutex> lock_guard(file_.get_file_access_mutex()); std::lock_guard<std::mutex> lock_guard(file_.get_file_access_mutex());
file_.ensure_is_at_least_length(file_offset); file_.ensure_is_at_least_length(file_offset);