Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-19 15:11:37 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

d64: update following sector extraction evolution

Browse Source
This commit is contained in:
Olivier Galibert 2021-03-30 14:23:52 +02:00
parent ce764cb094
commit 2180679a35
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib/formats/d64_dsk.cpp
View File

@ -298,14 +298,15 @@ void d64_format::extract_sectors(floppy_image *image, const format &f, desc_s *s
for(int i=0; i<sector_count; i++) {
desc_s &ds = sdesc[i];
const auto &data = sectors[ds.sector_id];
if(data.empty())
if(ds.sector_id >= sectors.size() || sectors[ds.sector_id].empty())
memset((void *)ds.data, 0, ds.size);
else if(data.size() < ds.size) {
memcpy((void *)ds.data, data.data(), data.size());
memset((uint8_t *)ds.data + data.size(), 0, data.size() - ds.size);
else if(sectors[ds.sector_id].size() < ds.size) {
memcpy((void *)ds.data, sectors[ds.sector_id].data(), sectors[ds.sector_id].size());
memset((uint8_t *)ds.data + sectors[ds.sector_id].size(), 0, sectors[ds.sector_id].size() - ds.size);
} else
memcpy((void *)ds.data, data.data(), ds.size);
memcpy((void *)ds.data, sectors[ds.sector_id].data(), ds.size);
}
}