[Scummvm-cvs-logs] scummvm master -> 113a2824c41283facd7ae6c24be3f74213207bc9

sev- sev at scummvm.org
Fri Jun 6 14:56:26 CEST 2014


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

Summary:
4457a967a5 FULLPIPE: Initialize class variables. CID 1204256
6bf2022913 FULLPIPE: Fix potential null dereference. CID 1148380
e4403eea56 FULLPIPE: Remove extra sizeof. CID 1220156
631d4cdc0a FULLPIPE: Remove extra null check. CID 1220155
5c018d6228 FULLPIPE: Add additional sanity check. CID 1220154
89ab5f7f63 FULLPIPE: Add missing break. CID 1216226
8d16014292 FULLPIPE: Fix memory leak and missing results. CID 1216225
113a2824c4 FULLPIPE: Fix binary logic. CID 1216221


Commit: 4457a967a5e9e1c283d68e929bf33025c5014f37
    https://github.com/scummvm/scummvm/commit/4457a967a5e9e1c283d68e929bf33025c5014f37
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-06-06T15:09:53+03:00

Commit Message:
FULLPIPE: Initialize class variables. CID 1204256

Changed paths:
    engines/fullpipe/modal.cpp



diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index 8981cdb..3dbbeb7 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -1456,6 +1456,9 @@ ModalSaveGame::ModalSaveGame() {
 	_cancelL = 0;
 	_emptyD = 0;
 	_emptyL = 0;
+	_fullD = 0;
+	_fullL = 0;
+	_menuScene = 0;
 	_queryRes = -1;
 	_rect = g_fp->_sceneRect;
 	_queryDlg = 0;


Commit: 6bf20229138f312060c9496d4a99ace58e0a09d2
    https://github.com/scummvm/scummvm/commit/6bf20229138f312060c9496d4a99ace58e0a09d2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-06-06T15:11:13+03:00

Commit Message:
FULLPIPE: Fix potential null dereference. CID 1148380

Changed paths:
    engines/fullpipe/scenes/scene16.cpp



diff --git a/engines/fullpipe/scenes/scene16.cpp b/engines/fullpipe/scenes/scene16.cpp
index 9ed355f..ed3c51a 100644
--- a/engines/fullpipe/scenes/scene16.cpp
+++ b/engines/fullpipe/scenes/scene16.cpp
@@ -182,7 +182,7 @@ void sceneHandler16_fillMug() {
 			mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC16_BOYOUT), 0, 1);
 
 			mq->replaceKeyCode(-1, g_vars->scene16_walkingBoy->_okeyCode);
-			if (mq->chain(g_vars->scene16_walkingBoy) || !mq)
+			if (!mq || mq->chain(g_vars->scene16_walkingBoy))
 				return;
 		} else {
 			if (!g_vars->scene16_walkingGirl)


Commit: e4403eea5633d406cd182caeee262b9010b34c06
    https://github.com/scummvm/scummvm/commit/e4403eea5633d406cd182caeee262b9010b34c06
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-06-06T15:12:35+03:00

Commit Message:
FULLPIPE: Remove extra sizeof. CID 1220156

Changed paths:
    engines/fullpipe/scenes.cpp



diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index b346bf3..4caa9a4 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -1463,7 +1463,7 @@ Ball *BallChain::sub04(Ball *ballP, Ball *ballN) {
 			runPtr->p0 = pTail;
 			pTail = runPtr;
 
-			runPtr -= sizeof(Ball);
+			runPtr--;
 		}
 	}
 


Commit: 631d4cdc0adabdc4a1cfb90f3a1b18eca841927c
    https://github.com/scummvm/scummvm/commit/631d4cdc0adabdc4a1cfb90f3a1b18eca841927c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-06-06T15:13:56+03:00

Commit Message:
FULLPIPE: Remove extra null check. CID 1220155

Changed paths:
    engines/fullpipe/motion.cpp



diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index caac6d9..56ac02c 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -554,8 +554,7 @@ MessageQueue *MctlLadder::doWalkTo(StaticANIObject *ani, int xpos, int ypos, int
 
 		mq->transferExCommands(newmq);
 
-		if (newmq)
-			delete newmq;
+		delete newmq;
 
 		ani->setPicAniInfo(&picinfo);
 


Commit: 5c018d62281e8f56c1455ca778fdbda66ff7c64d
    https://github.com/scummvm/scummvm/commit/5c018d62281e8f56c1455ca778fdbda66ff7c64d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-06-06T15:19:19+03:00

Commit Message:
FULLPIPE: Add additional sanity check. CID 1220154

Changed paths:
    engines/fullpipe/scenes.cpp



diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 4caa9a4..13c653a 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -1455,6 +1455,9 @@ void BallChain::init(Ball **ball) {
 
 Ball *BallChain::sub04(Ball *ballP, Ball *ballN) {
 	if (!pTail) {
+		if (!cPlexLen)
+			error("BallChain::sub04: cPlexLen is 0");
+
 		cPlex = (byte *)calloc(cPlexLen, sizeof(Ball));
 
 		Ball *runPtr = (Ball *)&cPlex[(cPlexLen - 1) * sizeof(Ball)];


Commit: 89ab5f7f63315c10574d1d30c8aba2b903c3a898
    https://github.com/scummvm/scummvm/commit/89ab5f7f63315c10574d1d30c8aba2b903c3a898
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-06-06T15:38:29+03:00

Commit Message:
FULLPIPE: Add missing break. CID 1216226

Changed paths:
    engines/fullpipe/motion.cpp



diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 56ac02c..66c405a 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -1135,6 +1135,8 @@ MessageQueue *MovGraph::sub1(StaticANIObject *ani, int x, int y, int stid, int x
 			_items[idx]->movarr._link = 0;
 
 			res = fillMGMinfo(_items[idx]->ani, &_items[idx]->movarr, stid2);
+
+			break;
 		}
 	}
 


Commit: 8d16014292f738e8269713dc64ad23a7364cf4ad
    https://github.com/scummvm/scummvm/commit/8d16014292f738e8269713dc64ad23a7364cf4ad
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-06-06T15:44:17+03:00

Commit Message:
FULLPIPE: Fix memory leak and missing results. CID 1216225

Changed paths:
    engines/fullpipe/motion.cpp



diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 66c405a..adfc2f7 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -1518,6 +1518,8 @@ Common::Array<MovItem *> *MovGraph::calcMovItems(MovArr *movarr1, MovArr *movarr
 
 		genMovItem(r, tempObList2[i], movarr1, movarr2);
 
+		res->push_back(r);
+
 		delete tempObList2[i];
 	}
 


Commit: 113a2824c41283facd7ae6c24be3f74213207bc9
    https://github.com/scummvm/scummvm/commit/113a2824c41283facd7ae6c24be3f74213207bc9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-06-06T15:54:46+03:00

Commit Message:
FULLPIPE: Fix binary logic. CID 1216221

Changed paths:
    engines/fullpipe/statics.cpp



diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp
index 5d7de05..ec85141 100644
--- a/engines/fullpipe/statics.cpp
+++ b/engines/fullpipe/statics.cpp
@@ -979,11 +979,12 @@ void StaticANIObject::stopAnim_maybe() {
 					_ox += point.x;
 					_oy += point.y;
 				}
+			} else {
+			  _statics = _movement->_staticsObj2;
 			}
-		}
-
-		if (_movement->_currDynamicPhaseIndex || !(_flags & 0x40))
+		} else {
 			_statics = _movement->_staticsObj2;
+		}
 
 		_statics->getSomeXY(point);
 






More information about the Scummvm-git-logs mailing list