[Scummvm-cvs-logs] SF.net SVN: scummvm:[49220] tools/trunk/engines/scumm/extract_zak_c64.cpp

[sev at users.sourceforge.net]

Revision: 49220
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49220&view=rev
Author:   sev
Date:     2010-05-25 20:28:03 +0000 (Tue, 25 May 2010)

Log Message:
-----------
Fix bug #2999273: Tools, Zak C64 German: crash due to padding bytes

Modified Paths:
--------------
    tools/trunk/engines/scumm/extract_zak_c64.cpp

Modified: tools/trunk/engines/scumm/extract_zak_c64.cpp
===================================================================
--- tools/trunk/engines/scumm/extract_zak_c64.cpp	2010-05-25 19:28:32 UTC (rev 49219)
+++ tools/trunk/engines/scumm/extract_zak_c64.cpp	2010-05-25 20:28:03 UTC (rev 49220)
@@ -143,9 +143,13 @@
 		input->seek((SectorOffset[room_tracks_c64[i]] + room_sectors_c64[i]) * 256, SEEK_SET);
 
 		for (j = 0; j < ResourcesPerFile[i]; j++) {
-			unsigned short len = input->readUint16LE();
-			output.writeUint16LE(len);
+			unsigned short len;
 
+			do {
+				len = input->readUint16LE();
+				output.writeUint16LE(len);
+			} while (len == 0xffff);
+
 			for (len -= 2; len > 0; len--) {
 				output.writeByte(input->readByte());
 			}


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