[Scummvm-cvs-logs] SF.net SVN: scummvm:[54138] scummvm/trunk/engines/sci/engine/savegame.cpp

[lskovlun at users.sourceforge.net]

Revision: 54138
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54138&view=rev
Author:   lskovlun
Date:     2010-11-08 11:02:43 +0000 (Mon, 08 Nov 2010)

Log Message:
-----------
Fix assertion failure in SCI0 saving code

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/savegame.cpp

Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp	2010-11-08 03:55:16 UTC (rev 54137)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp	2010-11-08 11:02:43 UTC (rev 54138)
@@ -411,15 +411,19 @@
 
 		do {
 			int blockType = READ_LE_UINT16(buf);
-			int blockSize = READ_LE_UINT16(buf + 2);
+			int blockSize;
+			if (blockType == 0)
+				break;
+
+			blockSize = READ_LE_UINT16(buf + 2);
 			assert(blockSize > 0);
 
-			if (blockType == 0)
-				break;
+
 			if (blockType == SCI_OBJ_STRINGS)
 				s.syncBytes(buf, blockSize);
 
 			buf += blockSize;
+
 			if (_buf - buf == 0)
 				break;
 		} while (1);


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