empathicqubit/Mesen-SX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PPU: Fixed out-of-bounds memory accesses due to vram/cgram pointers not wrapping

Browse source
This commit is contained in:
Sour 2019-02-16 08:08:16 -05:00
parent da2d93aaed
commit fa36f36314
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Core/Ppu.cpp
View file

@ -183,7 +183,7 @@ void Ppu::Write(uint32_t addr, uint8_t value)
//VMDATAL - VRAM Data Write low byte //VMDATAL - VRAM Data Write low byte
_vram[_vramAddress << 1] = value; _vram[_vramAddress << 1] = value;
if(!_vramAddrIncrementOnSecondReg) { if(!_vramAddrIncrementOnSecondReg) {
_vramAddress += _vramIncrementValue; _vramAddress = (_vramIncrementValue + _vramIncrementValue) & 0x7FFF;
} }
break; break;
@ -191,7 +191,7 @@ void Ppu::Write(uint32_t addr, uint8_t value)
//VMDATAH - VRAM Data Write high byte //VMDATAH - VRAM Data Write high byte
_vram[(_vramAddress << 1) + 1] = value; _vram[(_vramAddress << 1) + 1] = value;
if(_vramAddrIncrementOnSecondReg) { if(_vramAddrIncrementOnSecondReg) {
_vramAddress += _vramIncrementValue; _vramAddress = (_vramIncrementValue + _vramIncrementValue) & 0x7FFF;
} }
break; break;
@ -203,7 +203,7 @@ void Ppu::Write(uint32_t addr, uint8_t value)
case 0x2122: case 0x2122:
//CGRAM Data write (CGDATA) //CGRAM Data write (CGDATA)
_cgram[_cgramAddress] = value; _cgram[_cgramAddress] = value;
_cgramAddress++; _cgramAddress = (_cgramAddress + 1) & (Ppu::CgRamSize - 1);
break; break;
case 0x4200: case 0x4200: