[Scummvm-cvs-logs] scummvm master -> 7ef9798fd402acb0d6e231dfda6282cc286fab5d

sev- sev at scummvm.org
Fri Oct 18 15:44:31 CEST 2013


This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8390e53fc0 FULLPIPE: Plug resource leak. CID 1107570
834ff819df DRACI: Fix negative array index read. CID 1003548
2a6a23e88a DRACI: Initialized class variables. CID 1003405
6ff57db90f DRASCULA: Initialize class variables. CID 1003403
fee20ebe31 DREAMWEB: Initialize few more class variables. CID 1003402
7ef9798fd4 TOUCHE: Initialize uninit variables. CID 1002423


Commit: 8390e53fc03fcbaa89c6a89a6573806f6563f102
    https://github.com/scummvm/scummvm/commit/8390e53fc03fcbaa89c6a89a6573806f6563f102
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-10-18T05:54:59-07:00

Commit Message:
FULLPIPE: Plug resource leak. CID 1107570

Changed paths:
    engines/fullpipe/motion.cpp



diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index b49b297..f6eb9d6 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -635,6 +635,8 @@ MessageQueue *MovGraph2::doWalkTo(StaticANIObject *obj, int xpos, int ypos, int
 			if (idxwalk == -1) {
 				obj->setPicAniInfo(&picAniInfo);
 
+				delete mq;
+
 				return 0;
 			}
 


Commit: 834ff819df5ec4b17989dfdf325e428a46ca5d02
    https://github.com/scummvm/scummvm/commit/834ff819df5ec4b17989dfdf325e428a46ca5d02
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-10-18T05:56:50-07:00

Commit Message:
DRACI: Fix negative array index read. CID 1003548

Changed paths:
    engines/draci/game.cpp



diff --git a/engines/draci/game.cpp b/engines/draci/game.cpp
index 271eb1e..ff5bcef 100644
--- a/engines/draci/game.cpp
+++ b/engines/draci/game.cpp
@@ -981,7 +981,7 @@ void Game::dialogueMenu(int dialogueID) {
 
 		debugC(7, kDraciLogicDebugLevel,
 			"hit: %d, _lines[hit]: %d, lastblock: %d, dialogueLines: %d, dialogueExit: %d",
-			hit, _lines[hit], _lastBlock, _dialogueLinesNum, _dialogueExit);
+			   hit, (hit >= 0 ? _lines[hit] : -1), _lastBlock, _dialogueLinesNum, _dialogueExit);
 
 		if ((!_dialogueExit) && (hit >= 0) && (_lines[hit] != -1)) {
 			if ((oldLines == 1) && (_dialogueLinesNum == 1) && (_lines[hit] == _lastBlock)) {


Commit: 2a6a23e88a8785a7f5f8fda5dc00ab0c71ee9bdc
    https://github.com/scummvm/scummvm/commit/2a6a23e88a8785a7f5f8fda5dc00ab0c71ee9bdc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-10-18T05:59:22-07:00

Commit Message:
DRACI: Initialized class variables. CID 1003405

Changed paths:
    engines/draci/game.cpp



diff --git a/engines/draci/game.cpp b/engines/draci/game.cpp
index ff5bcef..a5c8aa8 100644
--- a/engines/draci/game.cpp
+++ b/engines/draci/game.cpp
@@ -81,6 +81,25 @@ Game::Game(DraciEngine *vm) : _vm(vm), _walkingState(vm) {
 	_walkingMapOverlay = 0;
 	_walkingShortestPathOverlay = 0;
 	_walkingObliquePathOverlay = 0;
+	_currentItem = 0;
+	_itemUnderCursor = 0;
+	_previousItemPosition = 0;
+
+	for (i = 0; i < kInventorySlots; i++)
+		_inventory[i] = 0;
+
+	_newRoom = 0;
+	_newGate = 0;
+	_previousRoom = 0;
+	_pushedNewRoom = 0;
+	_pushedNewGate = 0;
+	_currentDialogue = 0;
+	_dialogueArchive = 0;
+	_dialogueBlocks = 0;
+	_dialogueBegin = 0;
+	_dialogueExit = 0;
+	_currentBlock = 0;
+	_lastBlock = 0;
 
 	BArchive *initArchive = _vm->_initArchive;
 	const BAFile *file;


Commit: 6ff57db90f5ec7e9b437da161328dee74cbe9dae
    https://github.com/scummvm/scummvm/commit/6ff57db90f5ec7e9b437da161328dee74cbe9dae
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-10-18T06:01:10-07:00

Commit Message:
DRASCULA: Initialize class variables. CID 1003403

Changed paths:
    engines/drascula/drascula.cpp



diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index d25b37d..9699dda 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -115,6 +115,32 @@ DrasculaEngine::DrasculaEngine(OSystem *syst, const DrasculaGameDescription *gam
 	_roomActionsSize = 0;
 	_talkSequencesSize = 0;
 	_numLangs = 0;
+	feetHeight = 0;
+	floorX1 = 0;
+	floorY1 = 0;
+	floorX2 = 0;
+	floorY2 = 0;
+	lowerLimit = 0;
+	upperLimit = 0;
+	trackFinal = 0;
+	walkToObject = 0;
+	objExit = 0;
+	_startTime = 0;
+	hasAnswer = 0;
+	savedTime = 0;
+	breakOut = 0;
+	vonBraunX = 0;
+	trackVonBraun = 0;
+	vonBraunHasMoved = 0;
+	newHeight = 0;
+	newWidth = 0;
+	color_solo = 0;
+	igorX = 0;
+	igorY = 0;
+	trackIgor = 0;
+	drasculaX = 0;
+	drasculaY = 0;
+	trackDrascula = 0;
 
 	_color = 0;
 	blinking = 0;


Commit: fee20ebe31ca687e6198d51a858f8b6bd9fc190a
    https://github.com/scummvm/scummvm/commit/fee20ebe31ca687e6198d51a858f8b6bd9fc190a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-10-18T06:04:48-07:00

Commit Message:
DREAMWEB: Initialize few more class variables. CID 1003402

Changed paths:
    engines/dreamweb/dreamweb.cpp



diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 08838a7..6c6f529 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -225,6 +225,13 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam
 	_linePointer = 0;
 	_lineDirection = 0;
 	_lineLength = 0;
+
+	_subtitles = 0;
+	_foreignRelease = 0;
+	_wonGame = 0;
+	_hasSpeech = 0;
+	_roomsSample = 0;
+	_copyProtection = 0;
 }
 
 DreamWebEngine::~DreamWebEngine() {


Commit: 7ef9798fd402acb0d6e231dfda6282cc286fab5d
    https://github.com/scummvm/scummvm/commit/7ef9798fd402acb0d6e231dfda6282cc286fab5d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-10-18T06:11:54-07:00

Commit Message:
TOUCHE: Initialize uninit variables. CID 1002423

Changed paths:
    engines/touche/touche.cpp



diff --git a/engines/touche/touche.cpp b/engines/touche/touche.cpp
index 5c133cc..89cc1ad 100644
--- a/engines/touche/touche.cpp
+++ b/engines/touche/touche.cpp
@@ -51,6 +51,28 @@ ToucheEngine::ToucheEngine(OSystem *system, Common::Language language)
 	_saveLoadCurrentSlot = 0;
 	_hideInventoryTexts = false;
 
+	_numOpcodes = 0;
+	_compressedSpeechData = 0;
+	_textData = 0;
+	_backdropBuffer = 0;
+	_menuKitData = 0;
+	_convKitData = 0;
+
+	for (int i = 0; i < NUM_SEQUENCES; i++)
+		_sequenceDataTable[i] = 0;
+
+	_programData = 0;
+	_programDataSize = 0;
+	_mouseData = 0;
+	_iconData = 0;
+	_currentBitmapWidth = 0;
+	_currentBitmapHeight = 0;
+	_currentImageWidth = 0;
+	_currentImageHeight = 0;
+	_roomWidth = 0;
+	_programTextDataPtr = 0;
+	_offscreenBuffer = 0;
+
 	_screenRect = Common::Rect(kScreenWidth, kScreenHeight);
 	_roomAreaRect = Common::Rect(kScreenWidth, kRoomHeight);
 






More information about the Scummvm-git-logs mailing list