[Scummvm-cvs-logs] SF.net SVN: scummvm: [32246] scummvm/trunk/engines/gob/scenery.cpp

[drmccoy at users.sourceforge.net]

Revision: 32246
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32246&view=rev
Author:   drmccoy
Date:     2008-05-24 07:54:22 -0700 (Sat, 24 May 2008)

Log Message:
-----------
Added updateStatic()'s sanity checks to renderStatic() as well.
Fixes an invalid read when entering the red light district

Modified Paths:
--------------
    scummvm/trunk/engines/gob/scenery.cpp

Modified: scummvm/trunk/engines/gob/scenery.cpp
===================================================================
--- scummvm/trunk/engines/gob/scenery.cpp	2008-05-24 14:44:22 UTC (rev 32245)
+++ scummvm/trunk/engines/gob/scenery.cpp	2008-05-24 14:54:22 UTC (rev 32246)
@@ -286,6 +286,9 @@
 			pieceIndex = planePtr->pieceIndex;
 			pictIndex = planePtr->pictIndex - 1;
 
+			if ((pictIndex >= _staticPictCount[scenery]) || (!ptr->pieces))
+				continue;
+
 			_vm->_draw->_destSpriteX = planePtr->destX;
 			_vm->_draw->_destSpriteY = planePtr->destY;
 			left = FROM_LE_16(ptr->pieces[pictIndex][pieceIndex].left);


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