Ticket #8063: validateResource.diff

scummvm/scumm/resource.cpp

@@ -1111 +1111 @@
 {
         byte *ptr;
 
-        CHECK_HEAP validateResource("getResourceAddress", type, idx);
+        CHECK_HEAP if (!validateResource("getResourceAddress", type, idx))
+                return NULL;
+
         if (!res.address[type]) {
                 debug(9, "getResourceAddress(%s,%d), res.address[type] == NULL", resTypeFromId(type), idx);
                 return NULL;
@@ -1174 +1176 @@
 
         CHECK_HEAP debug(9, "createResource(%s,%d,%d)", resTypeFromId(type), idx, size);
 
-        validateResource("allocating", type, idx);
+        if (!validateResource("allocating", type, idx))
+                return NULL;
         nukeResource(type, idx);
 
         expireResources(size);
@@ -1192 +1195 @@
         return ptr + sizeof(MemBlkHeader);      /* skip header */
 }
 
-void Scumm::validateResource(const char *str, int type, int idx)
+bool Scumm::validateResource(const char *str, int type, int idx)
 {
         if (type < rtFirst || type > rtLast || (uint) idx >= (uint) res.num[type]) {
                 warning("%s Illegal Glob type %s (%d) num %d", str, resTypeFromId(type), type, idx);
+                return false;
         }
+        return true;
 }
 
 void Scumm::nukeResource(int type, int idx)
@@ -1370 +1375 @@
 
 void Scumm::lock(int type, int i)
 {
-        validateResource("Locking", type, i);
+        if (!validateResource("Locking", type, i))
+                return;
         res.flags[type][i] |= RF_LOCK;
 
 //  debug(1, "locking %d,%d", type, i);
@@ -1378 +1384 @@
 
 void Scumm::unlock(int type, int i)
 {
-        validateResource("Unlocking", type, i);
+        if (!validateResource("Unlocking", type, i))
+                return;
         res.flags[type][i] &= ~RF_LOCK;
 
 //  debug(1, "unlocking %d,%d", type, i);
@@ -1386 +1393 @@
 
 bool Scumm::isResourceInUse(int type, int i)
 {
-        validateResource("isResourceInUse", type, i);
+        if (!validateResource("isResourceInUse", type, i))
+                return false;
         switch (type) {
         case rtRoom:
                 return _roomResource == (byte)i;
@@ -1503 +1511 @@
 
 bool Scumm::isResourceLoaded(int type, int idx)
 {
-        validateResource("isLoaded", type, idx);
+        if (!validateResource("isLoaded", type, idx))
+                return false;
         return res.address[type][idx] != NULL;
 }
 
@@ -1674 +1683 @@
 
 bool Scumm::isGlobInMemory(int type, int idx)
 {
-        validateResource("isGlobInMemory", type, idx);
+        if (!validateResource("isGlobInMemory", type, idx))
+                return false;
 
         return res.address[type][idx] != NULL;
 }

scummvm/scumm/scumm.h

@@ -600 +600 @@
         int readSoundResource(int type, int index);
         int readSoundResourceSmallHeader(int type, int index);
         void setResourceCounter(int type, int index, byte flag);
-        void validateResource(const char *str, int type, int index);
+        bool validateResource(const char *str, int type, int index);
         void increaseResourceCounter();
         bool isResourceInUse(int type, int i);
         bool isResourceLoaded(int type, int index);