[Scummvm-git-logs] scummvm master -> c118e2fe12b4ad50e77badd812ccc6d0e3cbd92a

[csnover]

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:
4b6b328bbb SCI32: Check for existence of visiblePlane before dereferencing
c118e2fe12 SCI32: Reset active hot rect index when changing hot rects


Commit: 4b6b328bbb8b434c41f997023eb8c3fdb00e7242
    https://github.com/scummvm/scummvm/commit/4b6b328bbb8b434c41f997023eb8c3fdb00e7242
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-10-10T19:35:28-05:00

Commit Message:
SCI32: Check for existence of visiblePlane before dereferencing

CID 1351620.

Changed paths:
    engines/sci/graphics/frameout.cpp



diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index 9451841..843fe5e 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -1004,6 +1004,10 @@ void GfxFrameout::calcLists(ScreenItemListList &drawLists, EraseListList &eraseL
 			_visiblePlanes.add(new Plane(plane));
 			--plane._created;
 		} else if (plane._updated) {
+			if (visiblePlane == nullptr) {
+				error("[GfxFrameout::calcLists]: Attempt to update nonexistent visible plane");
+			}
+
 			*visiblePlane = plane;
 			--plane._updated;
 		}


Commit: c118e2fe12b4ad50e77badd812ccc6d0e3cbd92a
    https://github.com/scummvm/scummvm/commit/c118e2fe12b4ad50e77badd812ccc6d0e3cbd92a
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-10-10T19:35:28-05:00

Commit Message:
SCI32: Reset active hot rect index when changing hot rects

Changed paths:
    engines/sci/event.cpp



diff --git a/engines/sci/event.cpp b/engines/sci/event.cpp
index bef3edb..44ac7ef 100644
--- a/engines/sci/event.cpp
+++ b/engines/sci/event.cpp
@@ -417,6 +417,7 @@ void EventManager::setHotRectanglesActive(const bool active) {
 
 void EventManager::setHotRectangles(const Common::Array<Common::Rect> &rects) {
 	_hotRects = rects;
+	_activeRectIndex = -1;
 }
 
 void EventManager::checkHotRectangles(const Common::Point &mousePosition) {