[Scummvm-cvs-logs] SF.net SVN: scummvm:[45414] scummvm/trunk/engines/kyra

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Mon Oct 26 21:07:37 CET 2009


Revision: 45414
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45414&view=rev
Author:   lordhoto
Date:     2009-10-26 20:07:37 +0000 (Mon, 26 Oct 2009)

Log Message:
-----------
- Fix some missing initialization warnings from cppcheck
- Fix two invalid memory accesses reported by cppcheck

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/detection.cpp
    scummvm/trunk/engines/kyra/lol.cpp
    scummvm/trunk/engines/kyra/screen_lok.cpp
    scummvm/trunk/engines/kyra/script.cpp
    scummvm/trunk/engines/kyra/script_tim.cpp
    scummvm/trunk/engines/kyra/sequences_lol.cpp
    scummvm/trunk/engines/kyra/sound_towns.cpp
    scummvm/trunk/engines/kyra/text.cpp
    scummvm/trunk/engines/kyra/vqa.cpp
    scummvm/trunk/engines/kyra/wsamovie.cpp

Modified: scummvm/trunk/engines/kyra/detection.cpp
===================================================================
--- scummvm/trunk/engines/kyra/detection.cpp	2009-10-26 20:03:07 UTC (rev 45413)
+++ scummvm/trunk/engines/kyra/detection.cpp	2009-10-26 20:07:37 UTC (rev 45414)
@@ -1326,7 +1326,7 @@
 	Common::sort(filenames.begin(), filenames.end());	// Sort (hopefully ensuring we are sorted numerically..)
 
 	SaveStateList saveList;
-	for (Common::StringList::const_iterator file = filenames.begin(); file != filenames.end(); file++) {
+	for (Common::StringList::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
 		// Obtain the last 3 digits of the filename, since they correspond to the save slot
 		int slotNum = atoi(file->c_str() + file->size() - 3);
 

Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp	2009-10-26 20:03:07 UTC (rev 45413)
+++ scummvm/trunk/engines/kyra/lol.cpp	2009-10-26 20:07:37 UTC (rev 45414)
@@ -2485,7 +2485,7 @@
 		numFireballs = fbCnt - 3;
 
 	FireballState *fireballState[3];
-	memset(fireballState, 0, sizeof(fireballState));
+	memset(&fireballState, 0, sizeof(fireballState));
 	for (i = 0; i < numFireballs; i++)
 		fireballState[i] = new FireballState(i);
 

Modified: scummvm/trunk/engines/kyra/screen_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen_lok.cpp	2009-10-26 20:03:07 UTC (rev 45413)
+++ scummvm/trunk/engines/kyra/screen_lok.cpp	2009-10-26 20:07:37 UTC (rev 45414)
@@ -33,6 +33,8 @@
 Screen_LoK::Screen_LoK(KyraEngine_LoK *vm, OSystem *system)
 	: Screen(vm, system) {
 	_vm = vm;
+	_unkPtr1 = _unkPtr2 = 0;
+	_bitBlitNum = 0;
 }
 
 Screen_LoK::~Screen_LoK() {

Modified: scummvm/trunk/engines/kyra/script.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script.cpp	2009-10-26 20:03:07 UTC (rev 45413)
+++ scummvm/trunk/engines/kyra/script.cpp	2009-10-26 20:07:37 UTC (rev 45414)
@@ -34,7 +34,7 @@
 #include "kyra/script.h"
 
 namespace Kyra {
-EMCInterpreter::EMCInterpreter(KyraEngine_v1 *vm) : _vm(vm) {
+EMCInterpreter::EMCInterpreter(KyraEngine_v1 *vm) : _vm(vm), _scriptData(0), _filename(0) {
 #define OPCODE(x) { &EMCInterpreter::x, #x }
 	static const OpcodeEntry opcodes[] = {
 		// 0x00
@@ -106,7 +106,7 @@
 	Common::SeekableReadStream *stream = _vm->resource()->createReadStream(filename);
 	if (!stream) {
 		error("Couldn't open script file '%s'", filename);
-		return false;	// for compilers that don't support NORETURN
+		return false;  // for compilers that don't support NORETURN
 	}
 
 	memset(scriptData, 0, sizeof(EMCData));
@@ -134,6 +134,9 @@
 	strncpy(_scriptData->filename, filename, 13);
 	_scriptData->filename[12] = 0;
 
+	_scriptData = 0;
+	_filename = 0;
+
 	return true;
 }
 

Modified: scummvm/trunk/engines/kyra/script_tim.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_tim.cpp	2009-10-26 20:03:07 UTC (rev 45413)
+++ scummvm/trunk/engines/kyra/script_tim.cpp	2009-10-26 20:07:37 UTC (rev 45414)
@@ -105,6 +105,7 @@
 
 	_palDelayInc = _palDiff = _palDelayAcc = 0;
 	_abortFlag = 0;
+	_tim = 0;
 }
 
 TIMInterpreter::~TIMInterpreter() {
@@ -185,6 +186,7 @@
 
 	_tim->isLoLOutro = (_vm->gameFlags().gameID == GI_LOL) && !scumm_stricmp(filename, "LOLFINAL.TIM");
 	_tim->lolCharacter = 0;
+	_tim = 0;
 
 	return _tim;
 }

Modified: scummvm/trunk/engines/kyra/sequences_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_lol.cpp	2009-10-26 20:03:07 UTC (rev 45413)
+++ scummvm/trunk/engines/kyra/sequences_lol.cpp	2009-10-26 20:07:37 UTC (rev 45414)
@@ -1233,7 +1233,7 @@
 
 	int curShapeFile = 0;
 	uint8 *shapes[12];
-	memset(shapes, 0, sizeof(shapes));
+	memset(&shapes, 0, sizeof(shapes));
 
 	loadOutroShapes(curShapeFile++, shapes);
 	uint8 *monsterPal = 0;

Modified: scummvm/trunk/engines/kyra/sound_towns.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_towns.cpp	2009-10-26 20:03:07 UTC (rev 45413)
+++ scummvm/trunk/engines/kyra/sound_towns.cpp	2009-10-26 20:07:37 UTC (rev 45414)
@@ -33,7 +33,7 @@
 
 #include "common/util.h"
 
-#define		EUPHONY_FADEOUT_TICKS		600
+#define EUPHONY_FADEOUT_TICKS 600
 
 namespace Kyra {
 
@@ -987,7 +987,7 @@
 }
 
 void Towns_EuphonyTrackQueue::setPlayBackStatus(bool playing) {
-	Towns_EuphonyTrackQueue * i = this;
+	Towns_EuphonyTrackQueue *i = this;
 	do {
 		i->_playing = playing;
 		i = i->_next;
@@ -1013,7 +1013,7 @@
 		return;
 	}
 
-	Towns_EuphonyTrackQueue * i = this;
+	Towns_EuphonyTrackQueue *i = this;
 	while (i->_next)
 		i = i->_next;
 

Modified: scummvm/trunk/engines/kyra/text.cpp
===================================================================
--- scummvm/trunk/engines/kyra/text.cpp	2009-10-26 20:03:07 UTC (rev 45413)
+++ scummvm/trunk/engines/kyra/text.cpp	2009-10-26 20:07:37 UTC (rev 45414)
@@ -42,6 +42,8 @@
 	_talkMessageY = 0xC;
 	_talkMessageH = 0;
 	_talkMessagePrinted = false;
+	memset(_talkSubstrings, 0, sizeof(_talkSubstrings));
+	memset(_talkBuffer, 0, sizeof(_talkBuffer));
 }
 
 void TextDisplayer::setTalkCoords(uint16 y) {

Modified: scummvm/trunk/engines/kyra/vqa.cpp
===================================================================
--- scummvm/trunk/engines/kyra/vqa.cpp	2009-10-26 20:03:07 UTC (rev 45413)
+++ scummvm/trunk/engines/kyra/vqa.cpp	2009-10-26 20:07:37 UTC (rev 45414)
@@ -50,6 +50,15 @@
 	_screen = _vm->screen();
 	_opened = false;
 	_x = _y = _drawPage = -1;
+	_frame = 0;
+	_vectorPointers = 0;
+	_numPartialCodeBooks = 0;
+	_partialCodeBookSize = 0;
+	_compressedCodeBook = 0;
+	_partialCodeBook = 0;
+	_codeBook = 0;
+	_frameInfo = 0;
+	memset(_buffers, 0, sizeof(_buffers));
 }
 
 VQAMovie::~VQAMovie() {

Modified: scummvm/trunk/engines/kyra/wsamovie.cpp
===================================================================
--- scummvm/trunk/engines/kyra/wsamovie.cpp	2009-10-26 20:03:07 UTC (rev 45413)
+++ scummvm/trunk/engines/kyra/wsamovie.cpp	2009-10-26 20:07:37 UTC (rev 45414)
@@ -35,7 +35,10 @@
 #include "kyra/resource.h"
 
 namespace Kyra {
-WSAMovie_v1::WSAMovie_v1(KyraEngine_v1 *vm) : Movie(vm) {}
+WSAMovie_v1::WSAMovie_v1(KyraEngine_v1 *vm)
+    : Movie(vm), _frameData(0), _frameOffsTable(0), _offscreenBuffer(0), _deltaBuffer(0) {
+}
+
 WSAMovie_v1::~WSAMovie_v1() { close(); }
 
 int WSAMovie_v1::open(const char *filename, int offscreenDecode, Palette *palBuf) {


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