[Scummvm-cvs-logs] SF.net SVN: scummvm: [25806] scummvm/trunk/engines/scumm/resource.cpp

[fingolfin at users.sourceforge.net]

Revision: 25806
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25806&view=rev
Author:   fingolfin
Date:     2007-02-22 18:35:01 -0800 (Thu, 22 Feb 2007)

Log Message:
-----------
Modify ScummEngine::getResourceSize to assert if called on a missing resource, instead of trying to read from high memory

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/resource.cpp

Modified: scummvm/trunk/engines/scumm/resource.cpp
===================================================================
--- scummvm/trunk/engines/scumm/resource.cpp	2007-02-23 02:10:28 UTC (rev 25805)
+++ scummvm/trunk/engines/scumm/resource.cpp	2007-02-23 02:35:01 UTC (rev 25806)
@@ -721,6 +721,7 @@
 
 int ScummEngine::getResourceSize(int type, int idx) {
 	byte *ptr = getResourceAddress(type, idx);
+	assert(ptr);
 	MemBlkHeader *hdr = (MemBlkHeader *)(ptr - sizeof(MemBlkHeader));
 
 	return hdr->size;


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