[Scummvm-cvs-logs] SF.net SVN: scummvm:[35107] scummvm/trunk/engines/scumm/smush/saud_channel. cpp

[eriktorbjorn at users.sourceforge.net]

Revision: 35107
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35107&view=rev
Author:   eriktorbjorn
Date:     2008-11-17 20:36:10 +0000 (Mon, 17 Nov 2008)

Log Message:
-----------
Hopefully fixed the regression described in bug #2299682 ("FT: Crash in the intro
(regression in r34516)"), after discussing with Fingolfin. We didn't use to check
the size of the STRK chunk before, and he didn't remember why we do now, so I've
removed that test again.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/smush/saud_channel.cpp

Modified: scummvm/trunk/engines/scumm/smush/saud_channel.cpp
===================================================================
--- scummvm/trunk/engines/scumm/smush/saud_channel.cpp	2008-11-17 11:10:34 UTC (rev 35106)
+++ scummvm/trunk/engines/scumm/smush/saud_channel.cpp	2008-11-17 20:36:10 UTC (rev 35107)
@@ -62,12 +62,9 @@
 			break;
 		case MKID_BE('SMRK'):
 			_inData = false;
-			if (available_size >= (size + 8)) {
-				int32 subSize = READ_BE_UINT32((byte *)_tbuffer + offset + 4);
-				if (subSize != 0)
-					error("SMRK has an invalid size : %d", subSize);
+			if (available_size >= (size + 8))
 				_markReached = true;
-			} else
+			else
 				return false;
 			break;
 		case MKID_BE('SHDR'):


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