[Scummvm-cvs-logs] SF.net SVN: scummvm:[43677] scummvm/branches/branch-1-0-0/engines/made/ resource.cpp

mthreepwood at users.sourceforge.net mthreepwood at users.sourceforge.net
Sun Aug 23 23:22:51 CEST 2009


Revision: 43677
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43677&view=rev
Author:   mthreepwood
Date:     2009-08-23 21:22:51 +0000 (Sun, 23 Aug 2009)

Log Message:
-----------
Backport r43676 (fix for bug #2843050).

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/engines/made/resource.cpp

Modified: scummvm/branches/branch-1-0-0/engines/made/resource.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/made/resource.cpp	2009-08-23 21:15:47 UTC (rev 43676)
+++ scummvm/branches/branch-1-0-0/engines/made/resource.cpp	2009-08-23 21:22:51 UTC (rev 43677)
@@ -525,7 +525,10 @@
 
 ResourceSlot *ResourceReader::getResourceSlot(uint32 resType, uint index) {
 	ResourceSlots *slots = _resSlots[resType];
-	assert(slots);
+
+	if (!slots)
+		return NULL;
+
 	if (index >= 1 && index < slots->size()) {
 		return &(*slots)[index];
 	} else {


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