[Scummvm-cvs-logs] SF.net SVN: scummvm:[53472] scummvm/trunk/engines/cruise

[sev at users.sourceforge.net]

Revision: 53472
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53472&view=rev
Author:   sev
Date:     2010-10-15 08:57:18 +0000 (Fri, 15 Oct 2010)

Log Message:
-----------
CRUISE: Fix some code analysis warnings (bug #3087829)

Modified Paths:
--------------
    scummvm/trunk/engines/cruise/function.cpp
    scummvm/trunk/engines/cruise/script.cpp
    scummvm/trunk/engines/cruise/vars.cpp
    scummvm/trunk/engines/cruise/vars.h

Modified: scummvm/trunk/engines/cruise/function.cpp
===================================================================
--- scummvm/trunk/engines/cruise/function.cpp	2010-10-15 08:52:22 UTC (rev 53471)
+++ scummvm/trunk/engines/cruise/function.cpp	2010-10-15 08:57:18 UTC (rev 53472)
@@ -58,9 +58,9 @@
 
 	updateAllScriptsImports();
 
-	strcpy(nextOverlay, overlayName);
+	strncpy(nextOverlay, overlayName, 38);
 
-	return(overlayLoadResult);
+	return overlayLoadResult;
 }
 
 int16 Op_Strcpy() {

Modified: scummvm/trunk/engines/cruise/script.cpp
===================================================================
--- scummvm/trunk/engines/cruise/script.cpp	2010-10-15 08:52:22 UTC (rev 53471)
+++ scummvm/trunk/engines/cruise/script.cpp	2010-10-15 08:57:18 UTC (rev 53472)
@@ -185,8 +185,9 @@
 			return 0;
 		}
 		case 2: {
+			assert (ptr);
 			*(ptr + var_A + offset) = var;
-			return (0);
+			return 0;
 		}
 		default:
 			error("Unsupported code in opcodeType1 case 1");

Modified: scummvm/trunk/engines/cruise/vars.cpp
===================================================================
--- scummvm/trunk/engines/cruise/vars.cpp	2010-10-15 08:52:22 UTC (rev 53471)
+++ scummvm/trunk/engines/cruise/vars.cpp	2010-10-15 08:57:18 UTC (rev 53472)
@@ -51,8 +51,8 @@
 
 int16 numOfDisks;
 
-char lastOverlay[15];
-char nextOverlay[15];
+char lastOverlay[38];
+char nextOverlay[38];
 
 int16 currentActiveMenu;
 int16 autoMsg;

Modified: scummvm/trunk/engines/cruise/vars.h
===================================================================
--- scummvm/trunk/engines/cruise/vars.h	2010-10-15 08:52:22 UTC (rev 53471)
+++ scummvm/trunk/engines/cruise/vars.h	2010-10-15 08:57:18 UTC (rev 53472)
@@ -154,8 +154,8 @@
 
 extern int16 numOfDisks;
 
-extern char lastOverlay[15];
-extern char nextOverlay[15];
+extern char lastOverlay[38];
+extern char nextOverlay[38];
 
 extern int16 currentActiveMenu;
 extern int16 autoMsg;


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