libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-12 22:51:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SLUDGE: Fix out of bounds read in Z-Buffer code

Browse Source 
When window dimensions and scene dimensions are not equal, an out of
bounds read occurred.

In frasse, if you were to go up, left and then left again, you will
arrive on a scene with a mountain. This scene uses a z-buffer wider
than the screen width. This caused issues with the existing z-buffer
code.
This commit is contained in:
polyesterswing 2023-11-18 22:44:46 +05:30 committed by Eugene Sandulenko
parent cc714bd989
commit 2b7b405ad9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/sludge/zbuffer.cpp
View File

@ -172,7 +172,7 @@ void GraphicsManager::drawSpriteToZBuffer(int x, int y, uint8 depth, const Graph
byte *target = (byte *)_renderSurface.getBasePtr(x1 + x, y1 + y);
const byte *source = (const byte *)surface.getBasePtr(x1, y1);
if (depth > _zBufferSurface[(y1 + y) * _sceneWidth + (x1 + x)]) {
if (depth > _zBufferSurface[(y1 + y) * _winWidth + (x1 + x)]) {
if (source[0] == 0xff) {
// Completely opaque, so copy RGB values over
@ -193,8 +193,8 @@ void GraphicsManager::drawZBuffer(int x, int y, bool upsidedown) {
fillZBuffer(0);
for (uint y1 = y; y1 < _zBuffer->height + y; y1++) {
for (uint x1 = x; x1 < _zBuffer->width + x; x1++) {
for (uint y1 = y; y1 < _winHeight + y; y1++) {
for (uint x1 = x; x1 < _winWidth + x; x1++) {
uint8 z = 0;
@ -205,8 +205,8 @@ void GraphicsManager::drawZBuffer(int x, int y, bool upsidedown) {
}
if ( z > _zBufferSurface[y1 * _winWidth + x1])
_zBufferSurface[y1 * _winWidth + x1] = z;
if ( z > _zBufferSurface[(y1 - y) * _winWidth + (x1 - x)])
_zBufferSurface[(y1 - y) * _winWidth + (x1 - x)] = z;
}
}