[Scummvm-cvs-logs] SF.net SVN: scummvm:[34839] scummvm/trunk

[buddha_ at users.sourceforge.net]

Revision: 34839
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34839&view=rev
Author:   buddha_
Date:     2008-10-22 20:29:17 +0000 (Wed, 22 Oct 2008)

Log Message:
-----------
Shut up MSVC and add FIXMEs to Sword's listSaves and ThemeEngine's loadThemeXML.

Modified Paths:
--------------
    scummvm/trunk/engines/sword1/sword1.cpp
    scummvm/trunk/gui/ThemeEngine.cpp

Modified: scummvm/trunk/engines/sword1/sword1.cpp
===================================================================
--- scummvm/trunk/engines/sword1/sword1.cpp	2008-10-22 19:56:38 UTC (rev 34838)
+++ scummvm/trunk/engines/sword1/sword1.cpp	2008-10-22 20:29:17 UTC (rev 34839)
@@ -208,8 +208,10 @@
 
 	Common::InSaveFile *in = saveFileMan->openForLoading("SAVEGAME.INF");
 	if (in) {
-		uint8 stop;
+		// FIXME: Is it ok to initialize the stop-variable to zero?
+		uint8 stop = 0;
 		char saveDesc[32];
+		// FIXME: What about if file-iterator goes beyond end before stop == 255 || in->eos()?
 		do {
 			if (file->compareToIgnoreCase("SAVEGAME.INF") == 0) {
 				file++;

Modified: scummvm/trunk/gui/ThemeEngine.cpp
===================================================================
--- scummvm/trunk/gui/ThemeEngine.cpp	2008-10-22 19:56:38 UTC (rev 34838)
+++ scummvm/trunk/gui/ThemeEngine.cpp	2008-10-22 20:29:17 UTC (rev 34839)
@@ -525,7 +525,8 @@
 	if (!node.exists() || !node.isReadable())
 		return false;
 
-	Common::Archive *archive;
+	// FIXME: Should this be initialized to something else than NULL?
+	Common::Archive *archive = NULL;
 
 	if (node.getName().hasSuffix(".zip") && !node.isDirectory()) {
 #ifdef USE_ZLIB
@@ -544,6 +545,8 @@
 	}
 
 	Common::File themercFile;
+	// FIXME: Possibly dereferencing a NULL pointer here if the node's
+	// name doesn't have a ".zip" suffix and the node is not a directory.
 	themercFile.open("THEMERC", *archive);
 	if (!themercFile.isOpen()) {
 		delete archive;


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