[Scummvm-cvs-logs] SF.net SVN: scummvm:[43475] scummvm/trunk/engines/kyra/screen.cpp

[lordhoto at users.sourceforge.net]

Revision: 43475
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43475&view=rev
Author:   lordhoto
Date:     2009-08-17 12:47:57 +0000 (Mon, 17 Aug 2009)

Log Message:
-----------
Fix possible out of bounds access in Screen::drawShape.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/screen.cpp

Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp	2009-08-17 12:22:30 UTC (rev 43474)
+++ scummvm/trunk/engines/kyra/screen.cpp	2009-08-17 12:47:57 UTC (rev 43475)
@@ -1253,8 +1253,7 @@
 	}
 
 	if (flags & 0x200) {
-		++_drawShapeVar1;
-		_drawShapeVar1 &= (_vm->gameFlags().gameID == GI_KYRA1) ? 0x7 : 0xF;
+		_drawShapeVar1 = (_drawShapeVar1 + 1) & 0x7;
 		_drawShapeVar3 = drawShapeVar2[_drawShapeVar1];
 		_drawShapeVar4 = 0;
 		_drawShapeVar5 = 256;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.