aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMax Horn2007-02-23 02:35:01 +0000
committerMax Horn2007-02-23 02:35:01 +0000
commitf1f28b61a981293c22fbf16e4b8e27c0206e68c3 (patch)
tree0cc974460817085d3aa57f830975921b3e945b5f /engines
parenta63a71eb780549c936c00913d10372252869aabf (diff)
downloadscummvm-rg350-f1f28b61a981293c22fbf16e4b8e27c0206e68c3.tar.gz
scummvm-rg350-f1f28b61a981293c22fbf16e4b8e27c0206e68c3.tar.bz2
scummvm-rg350-f1f28b61a981293c22fbf16e4b8e27c0206e68c3.zip
Modify ScummEngine::getResourceSize to assert if called on a missing resource, instead of trying to read from high memory
svn-id: r25806
Diffstat (limited to 'engines')
-rw-r--r--engines/scumm/resource.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp
index 1af71d5c0d..8cc54dced2 100644
--- a/engines/scumm/resource.cpp
+++ b/engines/scumm/resource.cpp
@@ -721,6 +721,7 @@ int ScummEngine::getResourceRoomNr(int type, int idx) {
int ScummEngine::getResourceSize(int type, int idx) {
byte *ptr = getResourceAddress(type, idx);
+ assert(ptr);
MemBlkHeader *hdr = (MemBlkHeader *)(ptr - sizeof(MemBlkHeader));
return hdr->size;