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

GBA Video: Fix mode 2 out-of-bounds VRAM crash

This commit is contained in:
Vicki Pfau 2020-07-17 14:45:08 -07:00
parent d9ecac8cca
commit 6549da4490
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -13,6 +13,7 @@ Bugfixes:
- DS Video: Fix 2D/3D blending alpha values
- DS I/O: Enable POWCNT1 bit 1 at boot (fixes mgba.io/i/616)
- DS Slot-1: Reply to IR 0x08 command properly (fixes mgba.io/i/666)
- GBA Video: Fix mode 2 out-of-bounds VRAM crash
Misc:
- DS GX: Clean up and unify texture mapping
- DS Core: Add symbol loading

7
src/gba/renderers/software-bg.c
View File

@ -33,7 +33,12 @@
#define MODE_2_NO_MOSAIC(COORD) \
COORD \
uint32_t screenBase = background->screenBase + (localX >> 11) + (((localY >> 7) & 0x7F0) << background->size); \
mapData = ((uint8_t*) renderer->d.vramBG[screenBase >> VRAM_BLOCK_OFFSET])[screenBase & VRAM_BLOCK_MASK]; \
uint8_t* screenBlock = (uint8_t*) renderer->d.vramBG[screenBase >> VRAM_BLOCK_OFFSET]; \
if (UNLIKELY(!screenBlock)) { \
mapData = 0; \
} else { \
mapData = screenBlock[screenBase & VRAM_BLOCK_MASK]; \
} \
uint32_t charBase = background->charBase + (mapData << 6) + ((localY & 0x700) >> 5) + ((localX & 0x700) >> 8); \
pixelData = ((uint8_t*) renderer->d.vramBG[charBase >> VRAM_BLOCK_OFFSET])[charBase & VRAM_BLOCK_MASK]; \