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

HD Packs: Prevent out-of-bound memory accesses when backgrounds are smaller than the screen

Browse source
This commit is contained in:
Souryo 2017-09-02 15:05:56 -04:00
parent 602643b0f2
commit 51d80b3a7d
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Core/HdNesPack.cpp
View file

@ -213,7 +213,8 @@ uint32_t HdNesPack::GetCustomBackgroundPixel(int x, int y, int offsetX, int offs
{ {
HdPackData *hdData = Console::GetHdData(); HdPackData *hdData = Console::GetHdData();
uint8_t brightness = hdData->Backgrounds[_backgroundIndex].Brightness; uint8_t brightness = hdData->Backgrounds[_backgroundIndex].Brightness;
uint32_t rgbColor = *(hdData->Backgrounds[_backgroundIndex].data() + (y * hdData->Scale + offsetY) * 256 * hdData->Scale + x * hdData->Scale + offsetX); uint32_t width = hdData->Backgrounds[_backgroundIndex].Data->Width;
uint32_t rgbColor = *(hdData->Backgrounds[_backgroundIndex].data() + (y * hdData->Scale + offsetY) * width + x * hdData->Scale + offsetX);
if(brightness < 255) { if(brightness < 255) {
return AdjustBrightness((uint8_t*)&rgbColor, brightness); return AdjustBrightness((uint8_t*)&rgbColor, brightness);
} else { } else {
@ -253,7 +254,7 @@ void HdNesPack::GetPixels(HdPpuPixelInfo *screenTiles, uint32_t x, uint32_t y, H
} }
} }
bool hasCustomBackground = _backgroundIndex >= 0 && y < hdData->Backgrounds[_backgroundIndex].Data->Height; bool hasCustomBackground = _backgroundIndex >= 0 && (y+1)*hdData->Scale <= hdData->Backgrounds[_backgroundIndex].Data->Height && (x+1)*hdData->Scale <= hdData->Backgrounds[_backgroundIndex].Data->Width;
bool hasNonBackgroundSurrounding = hasCustomBackground ? IsNextToSprite(screenTiles, x, y) : false; bool hasNonBackgroundSurrounding = hasCustomBackground ? IsNextToSprite(screenTiles, x, y) : false;
if(hasCustomBackground) { if(hasCustomBackground) {
DrawCustomBackground(outputBuffer, x, y, hdData->Scale, screenWidth); DrawCustomBackground(outputBuffer, x, y, hdData->Scale, screenWidth);