aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorColin Snover2016-08-28 20:21:33 -0500
committerColin Snover2016-09-29 19:39:16 -0500
commit4d3752f9af23b64bb477cb858f7035e299fc0b15 (patch)
tree4713e8441d04f0e5be2b5d4c4e6060bf699fa585 /engines/sci
parent2fcec86696ae9deaa1eee432ca8615169694bcf0 (diff)
downloadscummvm-rg350-4d3752f9af23b64bb477cb858f7035e299fc0b15.tar.gz
scummvm-rg350-4d3752f9af23b64bb477cb858f7035e299fc0b15.tar.bz2
scummvm-rg350-4d3752f9af23b64bb477cb858f7035e299fc0b15.zip
SCI32: Fix potential null pointer dereference
CID 1357041.
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/graphics/controls32.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/engines/sci/graphics/controls32.cpp b/engines/sci/graphics/controls32.cpp
index 7689655d1d..bdc7248708 100644
--- a/engines/sci/graphics/controls32.cpp
+++ b/engines/sci/graphics/controls32.cpp
@@ -441,6 +441,11 @@ void ScrollWindow::show() {
}
Plane *plane = g_sci->_gfxFrameout->getPlanes().findByObject(_plane);
+
+ if (plane == nullptr) {
+ error("[ScrollWindow::show]: Plane %04x:%04x not found", PRINT_REG(_plane));
+ }
+
plane->_screenItemList.add(_screenItem);
_visible = true;