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

[lordhoto at users.sourceforge.net]

Revision: 31370
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31370&view=rev
Author:   lordhoto
Date:     2008-04-03 14:42:04 -0700 (Thu, 03 Apr 2008)

Log Message:
-----------
Cleanup.
-This line, and those below, will be ignored--

M    kyra/resource.cpp

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

Modified: scummvm/trunk/engines/kyra/resource.cpp
===================================================================
--- scummvm/trunk/engines/kyra/resource.cpp	2008-04-03 21:25:05 UTC (rev 31369)
+++ scummvm/trunk/engines/kyra/resource.cpp	2008-04-03 21:42:04 UTC (rev 31370)
@@ -204,8 +204,9 @@
 		uint32 offset = f.pos();
 		f.seek(filenameOffset, SEEK_SET);
 
-		uint8 buffer[64];
-		f.read(buffer, sizeof(buffer));
+		uint8 buffer[13];
+		f.read(buffer, sizeof(buffer)-1);
+		buffer[12] = 0;
 		f.seek(offset + 16, SEEK_SET);
 
 		Common::String filename = (char*)buffer;
@@ -467,14 +468,16 @@
 		offset = SWAP_BYTES_32(offset);
 	}
 
+	Common::String file = "";
 	while (!stream.eos()) {
 		// The start offset of a file should never be in the filelist
 		if (offset < stream.pos() || offset > filesize)
 			return false;
 
-		Common::String file = "";
 		byte c = 0;
 
+		file = "";
+
 		while (!stream.eos() && (c = stream.readByte()) != 0)
 			file += c;
 
@@ -512,6 +515,7 @@
 		startoffset = SWAP_BYTES_32(startoffset);
 	}
 
+	Common::String file = "";
 	while (!stream.eos()) {
 		// The start offset of a file should never be in the filelist
 		if (startoffset < stream.pos() || startoffset > filesize) {
@@ -519,7 +523,7 @@
 			return false;
 		}
 
-		Common::String file = "";
+		file = "";
 		byte c = 0;
 
 		while (!stream.eos() && (c = stream.readByte()) != 0)


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