[Scummvm-cvs-logs] SF.net SVN: scummvm:[33810] scummvm/trunk/engines/cine

[buddha_ at users.sourceforge.net]

Revision: 33810
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33810&view=rev
Author:   buddha_
Date:     2008-08-12 22:45:38 +0000 (Tue, 12 Aug 2008)

Log Message:
-----------
Added possibility to get the read resource's size from readBundleFile. Made loadMsg handle input data that has empty strings residing just beyond the input buffer (Thanks Valgrind :-)).

Modified Paths:
--------------
    scummvm/trunk/engines/cine/msg.cpp
    scummvm/trunk/engines/cine/part.cpp
    scummvm/trunk/engines/cine/part.h

Modified: scummvm/trunk/engines/cine/msg.cpp
===================================================================
--- scummvm/trunk/engines/cine/msg.cpp	2008-08-12 21:23:40 UTC (rev 33809)
+++ scummvm/trunk/engines/cine/msg.cpp	2008-08-12 22:45:38 UTC (rev 33810)
@@ -34,29 +34,40 @@
 Common::StringList messageTable;
 
 void loadMsg(char *pMsgName) {
-	int i, count, len;
-	byte *ptr, *dataPtr;
-	const char *messagePtr;
+	uint32 sourceSize;
 
 	checkDataDisk(-1);
-
 	messageTable.clear();
+	byte *dataPtr = readBundleFile(findFileInBundle(pMsgName), &sourceSize);
 
-	ptr = dataPtr = readBundleFile(findFileInBundle(pMsgName));
-
 	setMouseCursor(MOUSE_CURSOR_DISK);
 
-	count = READ_BE_UINT16(ptr);
-	ptr += 2;
+	uint count = READ_BE_UINT16(dataPtr);
+	uint messageLenPos = 2;
+	uint messageDataPos = messageLenPos + 2 * count;
 
-	messagePtr = (const char*)(ptr + 2 * count);
+	// Read in the messages
+	for (uint i = 0; i < count; i++) {
+		// Read message's length
+		uint messageLen = READ_BE_UINT16(dataPtr + messageLenPos);
+		messageLenPos += 2;
 
-	for (i = 0; i < count; i++) {
-		len = READ_BE_UINT16(ptr);
-		ptr += 2;
-		
-		messageTable.push_back(messagePtr);
-		messagePtr += len;
+		// Store the read message.
+		// This code works around input data that has empty strings residing outside the input
+		// buffer (e.g. message indexes 58-254 in BATEAU.MSG in PROCS08 in Operation Stealth).
+		if (messageDataPos < sourceSize) {
+			messageTable.push_back((const char *)(dataPtr + messageDataPos));
+		} else {			
+			if (messageLen > 0) { // Only warn about overflowing non-empty strings
+				warning("loadMsg(%s): message (%d. / %d) is overflowing the input buffer. Replacing it with an empty string", pMsgName, i + 1, count);
+			} else {
+				debugC(5, kCineDebugPart, "loadMsg(%s): empty message (%d. / %d) resides outside input buffer", pMsgName, i + 1, count);
+			}
+			// Message resides outside the input buffer so we replace it with an empty string
+			messageTable.push_back("");
+		}
+		// Jump to the next message
+		messageDataPos += messageLen;
 	}
 
 	free(dataPtr);

Modified: scummvm/trunk/engines/cine/part.cpp
===================================================================
--- scummvm/trunk/engines/cine/part.cpp	2008-08-12 21:23:40 UTC (rev 33809)
+++ scummvm/trunk/engines/cine/part.cpp	2008-08-12 22:45:38 UTC (rev 33810)
@@ -217,7 +217,7 @@
 	g_cine->_partFileHandle.read(dataPtr, MIN(partBuffer[idx].packedSize, maxSize));
 }
 
-byte *readBundleFile(int16 foundFileIdx) {
+byte *readBundleFile(int16 foundFileIdx, uint32 *size) {
 	assert(foundFileIdx >= 0 && foundFileIdx < (int32)partBuffer.size());
 	bool error = false;
 	byte *dataPtr = (byte *)calloc(partBuffer[foundFileIdx].unpackedSize, 1);
@@ -236,6 +236,11 @@
 		warning("Error unpacking '%s' from bundle file '%s'", partBuffer[foundFileIdx].partName, currentPartName);
 	}
 
+	// Set the size variable if a pointer to it has been given
+	if (size != NULL) {
+		*size = partBuffer[foundFileIdx].unpackedSize;
+	}
+
 	return dataPtr;
 }
 

Modified: scummvm/trunk/engines/cine/part.h
===================================================================
--- scummvm/trunk/engines/cine/part.h	2008-08-12 21:23:40 UTC (rev 33809)
+++ scummvm/trunk/engines/cine/part.h	2008-08-12 22:45:38 UTC (rev 33810)
@@ -46,7 +46,7 @@
 
 void readFromPart(int16 idx, byte *dataPtr, uint32 maxSize);
 
-byte *readBundleFile(int16 foundFileIdx);
+byte *readBundleFile(int16 foundFileIdx, uint32 *size = NULL);
 byte *readBundleSoundFile(const char *entryName, uint32 *size = 0);
 byte *readFile(const char *filename, bool crypted = false);
 


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