[Scummvm-cvs-logs] scummvm master -> 843694933dd8c0e31a8964910730f4ce9d6b3995

[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:
b0d90ccccf ACCESS: Plug memory leak
843694933d TINSEL: Fix out-of-bounds array access


Commit: b0d90ccccf2c16694dca6ab2a1019cd7c4bd9c33
    https://github.com/scummvm/scummvm/commit/b0d90ccccf2c16694dca6ab2a1019cd7c4bd9c33
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-18T12:38:15+02:00

Commit Message:
ACCESS: Plug memory leak

Changed paths:
    engines/access/bubble_box.cpp



diff --git a/engines/access/bubble_box.cpp b/engines/access/bubble_box.cpp
index 89c5d07..e557019 100644
--- a/engines/access/bubble_box.cpp
+++ b/engines/access/bubble_box.cpp
@@ -611,6 +611,7 @@ int BubbleBox::doBox_v1(int item, int box, int &btnSelected) {
 		_vm->_events->showCursor();
 		warning("TODO: pop values");
 		_vm->_screen->restoreScreen();
+		delete icons;
 		return retval_;
 	}
 


Commit: 843694933dd8c0e31a8964910730f4ce9d6b3995
    https://github.com/scummvm/scummvm/commit/843694933dd8c0e31a8964910730f4ce9d6b3995
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-18T12:38:15+02:00

Commit Message:
TINSEL: Fix out-of-bounds array access

Changed paths:
    engines/tinsel/dialogs.cpp



diff --git a/engines/tinsel/dialogs.cpp b/engines/tinsel/dialogs.cpp
index ad20253..b5d090e 100644
--- a/engines/tinsel/dialogs.cpp
+++ b/engines/tinsel/dialogs.cpp
@@ -4617,9 +4617,9 @@ extern void Xmovement(int x) {
 			GetAniPosition(g_objArray[0], &g_InvD[g_ino].inventoryX, &aniY);
 			g_InvD[g_ino].inventoryX +=x;
 			MultiSetAniX(g_objArray[0], g_InvD[g_ino].inventoryX);
-			for (i = 1; g_objArray[i] && i < MAX_WCOMP; i++)
+			for (i = 1; i < MAX_WCOMP && g_objArray[i]; i++)
 				MultiMoveRelXY(g_objArray[i], x, 0);
-			for (i = 0; g_iconArray[i] && i < MAX_ICONS; i++)
+			for (i = 0; i < MAX_ICONS && g_iconArray[i]; i++)
 				MultiMoveRelXY(g_iconArray[i], x, 0);
 			break;
 
@@ -4665,9 +4665,9 @@ extern void Ymovement(int y) {
 			GetAniPosition(g_objArray[0], &aniX, &g_InvD[g_ino].inventoryY);
 			g_InvD[g_ino].inventoryY +=y;
 			MultiSetAniY(g_objArray[0], g_InvD[g_ino].inventoryY);
-			for (i = 1; g_objArray[i] && i < MAX_WCOMP; i++)
+			for (i = 1; i < MAX_WCOMP && g_objArray[i]; i++)
 				MultiMoveRelXY(g_objArray[i], 0, y);
-			for (i = 0; g_iconArray[i] && i < MAX_ICONS; i++)
+			for (i = 0; i < MAX_ICONS && g_iconArray[i]; i++)
 				MultiMoveRelXY(g_iconArray[i], 0, y);
 			break;