ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Disk] Add more failsafe in case of invalid offsets

This commit is contained in:
LuigiBlood 2019-08-14 16:32:13 +02:00
parent 3951fbe828
commit ddaff077b2
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Project64-core/N64System/N64DiskClass.cpp
View File

@ -668,6 +668,11 @@ uint32_t CN64Disk::GetDiskAddressBlock(uint16_t head, uint16_t track, uint16_t b
offset = 0xFFFFFFFF; offset = 0xFFFFFFFF;
} }
} }
if (offset >= m_DiskFileSize)
{
offset = 0xFFFFFFFF;
}
if (sector == 0) if (sector == 0)
{ {
WriteTrace(TraceN64System, TraceDebug, "Head %d Track %d Block %d - LBA %d - Address %08X", head, track, block, PhysToLBA(head, track, block), offset); WriteTrace(TraceN64System, TraceDebug, "Head %d Track %d Block %d - LBA %d - Address %08X", head, track, block, PhysToLBA(head, track, block), offset);
@ -797,8 +802,16 @@ void CN64Disk::InitSysDataD64()
GetDiskAddressSys()[5 ^ 3] |= 0x10; GetDiskAddressSys()[5 ^ 3] |= 0x10;
//Expand RAM Area for file format consistency //Expand RAM Area for file format consistency
*(uint16_t*)&GetDiskAddressSys()[0xE2 ^ 2] = RAM_START_LBA[m_DiskType] - SYSTEM_LBAS; if (m_DiskType < 6)
*(uint16_t*)&GetDiskAddressSys()[0xE4 ^ 2] = MAX_LBA - SYSTEM_LBAS; {
*(uint16_t*)&GetDiskAddressSys()[0xE2 ^ 2] = RAM_START_LBA[m_DiskType] - SYSTEM_LBAS;
*(uint16_t*)&GetDiskAddressSys()[0xE4 ^ 2] = MAX_LBA - SYSTEM_LBAS;
}
else
{
*(uint16_t*)&GetDiskAddressSys()[0xE2 ^ 2] = 0xFFFF;
*(uint16_t*)&GetDiskAddressSys()[0xE4 ^ 2] = 0xFFFF;
}
} }
void CN64Disk::DeinitSysDataD64() void CN64Disk::DeinitSysDataD64()