[Scummvm-cvs-logs] SF.net SVN: scummvm:[52907] scummvm/branches/branch-1-2-0/engines/agos/ items.cpp

Kirben at users.sourceforge.net Kirben at users.sourceforge.net
Sun Sep 26 14:23:57 CEST 2010


Revision: 52907
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52907&view=rev
Author:   Kirben
Date:     2010-09-26 12:23:57 +0000 (Sun, 26 Sep 2010)

Log Message:
-----------
AGOS: Backport fix for bug #3011638 - WAXWORKS: Crash retrieving spear from the crocodile carcass.

Modified Paths:
--------------
    scummvm/branches/branch-1-2-0/engines/agos/items.cpp

Modified: scummvm/branches/branch-1-2-0/engines/agos/items.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/engines/agos/items.cpp	2010-09-26 12:22:46 UTC (rev 52906)
+++ scummvm/branches/branch-1-2-0/engines/agos/items.cpp	2010-09-26 12:23:57 UTC (rev 52907)
@@ -429,6 +429,9 @@
 
 	for (j = 1; j < _itemArraySize; j++) {
 		Item *item = derefItem(j);
+		if (item == NULL)
+			continue;
+
 		if (wordMatch(item, a, n))
 			return item;
 	}
@@ -442,6 +445,9 @@
 
 	for (j = first; j < _itemArraySize; j++) {
 		Item *item = derefItem(j);
+		if (item == NULL)
+			continue;
+
 		if (wordMatch(item, a, n))
 			return item;
 	}


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