[Scummvm-cvs-logs] SF.net SVN: scummvm:[34554] scummvm/trunk/engines/saga/sprite.cpp

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Mon Sep 15 11:17:19 CEST 2008


Revision: 34554
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34554&view=rev
Author:   thebluegr
Date:     2008-09-15 09:17:18 +0000 (Mon, 15 Sep 2008)

Log Message:
-----------
Proper check for eos(), after the latest changes to OSystem

Modified Paths:
--------------
    scummvm/trunk/engines/saga/sprite.cpp

Modified: scummvm/trunk/engines/saga/sprite.cpp
===================================================================
--- scummvm/trunk/engines/saga/sprite.cpp	2008-09-15 06:52:00 UTC (rev 34553)
+++ scummvm/trunk/engines/saga/sprite.cpp	2008-09-15 09:17:18 UTC (rev 34554)
@@ -412,6 +412,8 @@
 
 	while (!readS.eos() && (outPointer < outPointerEnd)) {
 		bg_runcount = readS.readByte();
+		if (readS.eos())
+			break;
 		fg_runcount = readS.readByte();
 
 		for (c = 0; c < bg_runcount && !readS.eos(); c++) {
@@ -423,8 +425,9 @@
 		}
 
 		for (c = 0; c < fg_runcount && !readS.eos(); c++) {
-			// FIXME: eos changed; error handling?
 			*outPointer = readS.readByte();
+			if (readS.eos())
+				break;
 			if (outPointer < outPointerEnd)
 				outPointer++;
 			else


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