[Scummvm-cvs-logs] CVS: scummvm/scumm script_v72he.cpp,2.206,2.207 wiz_he.cpp,2.8,2.9

[kirben]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24375/scumm

Modified Files:
	script_v72he.cpp wiz_he.cpp 
Log Message:

Add more safety checks.


Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.206
retrieving revision 2.207
diff -u -d -r2.206 -r2.207
--- script_v72he.cpp	24 Feb 2005 20:20:35 -0000	2.206
+++ script_v72he.cpp	27 Feb 2005 00:42:52 -0000	2.207
@@ -598,8 +598,8 @@
 			return NULL;
 
 		size = getResourceDataSize(offs) / 4;
-		if ((uint32)state >= (uint32)size)
-			return NULL;
+		assert((uint32)state <= (uint32)size);
+			
 
 		offs += READ_LE_UINT32(offs + state * sizeof(uint32));
 		offs = findResourceData(tag, offs - 8);

Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.8
retrieving revision 2.9
diff -u -d -r2.8 -r2.9
--- wiz_he.cpp	26 Feb 2005 04:53:43 -0000	2.8
+++ wiz_he.cpp	27 Feb 2005 00:42:52 -0000	2.9
@@ -845,6 +845,7 @@
 	const uint8 *dataPtr = getResourceAddress(rtImage, resnum);
 	assert(dataPtr);
 	const uint8 *wizh = findWrappedBlock(MKID('WIZH'), dataPtr, state, 0);
+	assert(wizh);
 	w = READ_LE_UINT32(wizh + 0x4);
 	h = READ_LE_UINT32(wizh + 0x8);
 }
@@ -1311,10 +1312,10 @@
 	case 10:
 	case 11:
 	case 12:
-		warning("unhandled processWizImage mode %d", params->processMode);
+		warning("Unhandled processWizImage mode %d", params->processMode);
 		break;
 	default:
-		warning("invalid processWizImage mode %d", params->processMode);
+		debug(1, "Invalid processWizImage mode %d", params->processMode);
 	}
 }