[Scummvm-cvs-logs] SF.net SVN: scummvm:[48981] scummvm/trunk/engines/scumm/file.cpp
sev at users.sourceforge.net
sev at users.sourceforge.net
Sun May 9 20:05:00 CEST 2010
Revision: 48981
http://scummvm.svn.sourceforge.net/scummvm/?rev=48981&view=rev
Author: sev
Date: 2010-05-09 18:05:00 +0000 (Sun, 09 May 2010)
Log Message:
-----------
Patch #2968610: Zak C64 German: crash due to padding bytes
Modified Paths:
--------------
scummvm/trunk/engines/scumm/file.cpp
Modified: scummvm/trunk/engines/scumm/file.cpp
===================================================================
--- scummvm/trunk/engines/scumm/file.cpp 2010-05-09 13:31:34 UTC (rev 48980)
+++ scummvm/trunk/engines/scumm/file.cpp 2010-05-09 18:05:00 UTC (rev 48981)
@@ -431,8 +431,12 @@
}
for (i = 0; i < _resourcesPerFile[res]; i++) {
- uint16 len = fileReadUint16LE();
- reslen += write_word(out, len);
+ uint16 len;
+ do {
+ // Note: len might be 0xFFFF for padding in zak-c64-german
+ len = fileReadUint16LE();
+ reslen += write_word(out, len);
+ } while (len == 0xFFFF);
for (len -= 2; len > 0; len--)
reslen += write_byte(out, fileReadByte());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list