[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.287,2.288

Max Horn fingolfin at users.sourceforge.net
Sun Aug 15 09:24:02 CEST 2004


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14052

Modified Files:
	gfx.cpp 
Log Message:
Fix potential OOB access

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.287
retrieving revision 2.288
diff -u -d -r2.287 -r2.288
--- gfx.cpp	15 Aug 2004 16:07:30 -0000	2.287
+++ gfx.cpp	15 Aug 2004 16:23:18 -0000	2.288
@@ -643,7 +643,7 @@
 	if (vs->hasTwoBuffers && _currentRoom != 0 && isLightOn()) {
 		blit(screenBuf, vs->pitch, vs->getBackPixels(rect.left, rect.top), vs->pitch, width, height);
 		if (vs->number == kMainVirtScreen && _charset->_hasMask) {
-			byte *mask = (byte *)gdi._textSurface.pixels + gdi._textSurface.pitch * rect.top + rect.left;
+			byte *mask = (byte *)gdi._textSurface.pixels + gdi._textSurface.pitch * (rect.top - _screenTop) + rect.left;
 			fill(mask, gdi._textSurface.pitch, CHARSET_MASK_TRANSPARENCY, width, height);
 		}
 	} else {





More information about the Scummvm-git-logs mailing list