[Scummvm-cvs-logs] SF.net SVN: scummvm:[48434] scummvm/trunk/engines/draci/game.cpp
tdhs at users.sourceforge.net
tdhs at users.sourceforge.net
Wed Mar 31 05:19:01 CEST 2010
Revision: 48434
http://scummvm.svn.sourceforge.net/scummvm/?rev=48434&view=rev
Author: tdhs
Date: 2010-03-31 03:19:01 +0000 (Wed, 31 Mar 2010)
Log Message:
-----------
Basic correction for bug #2976774 "DRACI: Segfault Crash When Leaving Inventory".
This patch corrects the valgrind fault, but may not be the ultimate fix.
This should be reviewed before backport to v1.1.0 branch.
Modified Paths:
--------------
scummvm/trunk/engines/draci/game.cpp
Modified: scummvm/trunk/engines/draci/game.cpp
===================================================================
--- scummvm/trunk/engines/draci/game.cpp 2010-03-31 00:01:10 UTC (rev 48433)
+++ scummvm/trunk/engines/draci/game.cpp 2010-03-31 03:19:01 UTC (rev 48434)
@@ -332,7 +332,8 @@
// animation ID. In this way, we obtain its itemID.
if (_animUnderCursor != NULL && _animUnderCursor != _inventoryAnim && _animUnderCursor->getID() != kOverlayImage) {
_itemUnderCursor = getItem(kInventoryItemsID - _animUnderCursor->getID());
- assert(_itemUnderCursor->_anim == _animUnderCursor);
+ if (_itemUnderCursor != NULL)
+ assert(_itemUnderCursor->_anim == _animUnderCursor);
} else {
_itemUnderCursor = NULL;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list