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

dont read roms out of range

This commit is contained in:
zeromus 2018-11-02 16:26:50 -04:00
parent 2948d7597a
commit 4bb5ce8941
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libmupen64plus/mupen64plus-core/src/memory/memory.c
View File

@ -3741,7 +3741,14 @@ unsigned int *fast_mem_access(unsigned int address)
address = virtual_to_physical_address(address, 2);
if ((address & 0x1FFFFFFF) >= 0x10000000)
return (unsigned int *)rom + ((address & 0x1FFFFFFF) - 0x10000000)/4;
{
unsigned int ofs = ((address & 0x1FFFFFFF) - 0x10000000)/4;
if(ofs < rom_size/4)
return (unsigned int *)rom + ofs;
else {
return NULL;
}
}
else if ((address & 0x1FFFFFFF) < 0x800000)
return (unsigned int *)rdram + (address & 0x1FFFFFFF)/4;
else if (address >= 0xa4000000 && address <= 0xa4001000)