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

GB Memory: Fix out of bounds memory condition in GBView8/GBPatch8

This commit is contained in:
Jeffrey Pfau 2016-09-16 19:48:13 -07:00
parent a71007267d
commit e82c9aadea
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gb/memory.c
View File

@ -263,7 +263,7 @@ uint8_t GBView8(struct LR35902Core* cpu, uint16_t address, int segment) {
if (segment < 0) { if (segment < 0) {
return memory->romBank[address & (GB_SIZE_CART_BANK0 - 1)]; return memory->romBank[address & (GB_SIZE_CART_BANK0 - 1)];
} else { } else {
if ((size_t) segment * GB_SIZE_CART_BANK0 > memory->romSize) { if ((size_t) segment * GB_SIZE_CART_BANK0 >= memory->romSize) {
return 0xFF; return 0xFF;
} }
return memory->rom[(address & (GB_SIZE_CART_BANK0 - 1)) + segment * GB_SIZE_CART_BANK0]; return memory->rom[(address & (GB_SIZE_CART_BANK0 - 1)) + segment * GB_SIZE_CART_BANK0];
@ -501,7 +501,7 @@ void GBPatch8(struct LR35902Core* cpu, uint16_t address, int8_t value, int8_t* o
oldValue = memory->romBank[address & (GB_SIZE_CART_BANK0 - 1)]; oldValue = memory->romBank[address & (GB_SIZE_CART_BANK0 - 1)];
memory->romBank[address & (GB_SIZE_CART_BANK0 - 1)] = value; memory->romBank[address & (GB_SIZE_CART_BANK0 - 1)] = value;
} else { } else {
if ((size_t) segment * GB_SIZE_CART_BANK0 > memory->romSize) { if ((size_t) segment * GB_SIZE_CART_BANK0 >= memory->romSize) {
return; return;
} }
oldValue = memory->rom[(address & (GB_SIZE_CART_BANK0 - 1)) + segment * GB_SIZE_CART_BANK0]; oldValue = memory->rom[(address & (GB_SIZE_CART_BANK0 - 1)) + segment * GB_SIZE_CART_BANK0];