From 371b50e75abec89ed182a72599d96b645711bbc8 Mon Sep 17 00:00:00 2001 From: Colin Snover Date: Fri, 27 May 2016 18:59:12 -0500 Subject: SCI32: Add explicit checks for null pointers CID 1351617, 1351618, 1351619, 1351620, 1351621, 1351622, 1354791. --- engines/sci/graphics/screen_item32.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'engines/sci/graphics/screen_item32.cpp') diff --git a/engines/sci/graphics/screen_item32.cpp b/engines/sci/graphics/screen_item32.cpp index 953091470f..fba0fa0422 100644 --- a/engines/sci/graphics/screen_item32.cpp +++ b/engines/sci/graphics/screen_item32.cpp @@ -326,6 +326,9 @@ void ScreenItem::calcRects(const Plane &plane) { mulinc(temp, celToScreenX, Ratio()); CelObjPic *celObjPic = dynamic_cast(_celObj); + if (celObjPic == nullptr) { + error("Expected a CelObjPic"); + } temp.translate((celObjPic->_relativePosition.x * scriptToScreenX).toInt() - displaceX, 0); // TODO: This is weird. @@ -369,6 +372,9 @@ void ScreenItem::calcRects(const Plane &plane) { } CelObjPic *celObjPic = dynamic_cast(_celObj); + if (celObjPic == nullptr) { + error("Expected a CelObjPic"); + } temp.translate(celObjPic->_relativePosition.x - (displaceX * scaleX).toInt(), celObjPic->_relativePosition.y - (celObj._displace.y * scaleY).toInt()); // TODO: This is weird. -- cgit v1.2.3