[Scummvm-git-logs] scummvm master -> 9ef6980770425ebd37ec4cb7d8af1d006eea5d3b

[sev-]

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

Summary:
45732d0b03 FULLPIPE: Fix Movement::loadPixelData
9ef6980770 FULLPIPE: Fix out of bounds write in Movement::removeFirstPhase


Commit: 45732d0b03ed12fd48bf63d5daa6e8f8703aa130
    https://github.com/scummvm/scummvm/commit/45732d0b03ed12fd48bf63d5daa6e8f8703aa130
Author: Retro-Junk (bambarbee at yandex.ru)
Date: 2016-09-10T23:55:40+02:00

Commit Message:
FULLPIPE: Fix Movement::loadPixelData

Changed paths:
    engines/fullpipe/statics.cpp



diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp
index fe1f1e2..7b9737b 100644
--- a/engines/fullpipe/statics.cpp
+++ b/engines/fullpipe/statics.cpp
@@ -1949,12 +1949,12 @@ DynamicPhase *Movement::getDynamicPhaseByIndex(int idx) {
 
 void Movement::loadPixelData() {
 	Movement *mov = this;
-	for (Movement *i = _currMovement; i; i = i->_currMovement)
-		mov = i;
+	while (mov->_currMovement)
+		mov = mov->_currMovement;
 
-	for (uint i = 0; i < _dynamicPhases.size(); i++) {
-		if ((Statics *)_dynamicPhases[i] != mov->_staticsObj2 || !(mov->_staticsObj2->_staticsId & 0x4000))
-			_dynamicPhases[i]->getPixelData();
+	for (uint i = 0; i < mov->_dynamicPhases.size(); i++) {
+		if ((Statics *)mov->_dynamicPhases[i] != mov->_staticsObj2 || !(mov->_staticsObj2->_staticsId & 0x4000))
+			mov->_dynamicPhases[i]->getPixelData();
 	}
 
 	if (!(mov->_staticsObj1->_staticsId & 0x4000))


Commit: 9ef6980770425ebd37ec4cb7d8af1d006eea5d3b
    https://github.com/scummvm/scummvm/commit/9ef6980770425ebd37ec4cb7d8af1d006eea5d3b
Author: Retro-Junk (bambarbee at yandex.ru)
Date: 2016-09-10T23:55:46+02:00

Commit Message:
FULLPIPE: Fix out of bounds write in Movement::removeFirstPhase

Changed paths:
    engines/fullpipe/statics.cpp



diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp
index 7b9737b..83a0de0 100644
--- a/engines/fullpipe/statics.cpp
+++ b/engines/fullpipe/statics.cpp
@@ -1979,8 +1979,8 @@ void Movement::removeFirstPhase() {
 			_dynamicPhases.remove_at(0);
 
 			for (uint i = 0; i < _dynamicPhases.size(); i++) {
-				_framePosOffsets[i - 1]->x = _framePosOffsets[i]->x;
-				_framePosOffsets[i - 1]->y = _framePosOffsets[i]->y;
+				_framePosOffsets[i]->x = _framePosOffsets[i + 1]->x;
+				_framePosOffsets[i]->y = _framePosOffsets[i + 1]->y;
 			}
 		}
 		_currDynamicPhaseIndex--;