[Scummvm-cvs-logs] SF.net SVN: scummvm:[44690] scummvm/branches/branch-1-0-0/engines/made/ resource.cpp

[john_doe at users.sourceforge.net]

Revision: 44690
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44690&view=rev
Author:   john_doe
Date:     2009-10-06 07:39:51 +0000 (Tue, 06 Oct 2009)

Log Message:
-----------
Backport of r44688: Fix regression introduced by r44459; LGoP2 crashed after Infocom logo

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/engines/made/resource.cpp

Modified: scummvm/branches/branch-1-0-0/engines/made/resource.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/made/resource.cpp	2009-10-06 07:37:08 UTC (rev 44689)
+++ scummvm/branches/branch-1-0-0/engines/made/resource.cpp	2009-10-06 07:39:51 UTC (rev 44690)
@@ -499,9 +499,10 @@
 	_fd->readUint32LE(); // skip index size
 	_fd->readUint32LE(); // skip unknown
 	_fd->readUint32LE(); // skip res type
+	uint16 count1 = _fd->readUint16LE();
+	uint16 count2 = _fd->readUint16LE();
+	uint16 count = MAX(count1, count2);
 	_fd->readUint16LE(); // skip unknown count
-	uint16 count = _fd->readUint16LE();
-	_fd->readUint16LE(); // skip unknown count
 	for (uint16 i = 0; i < count; i++) {
 		uint32 offs = _fd->readUint32LE();
 		uint32 size = _fd->readUint32LE();


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