aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/graphics
diff options
context:
space:
mode:
authorColin Snover2016-08-28 20:22:29 -0500
committerColin Snover2016-09-29 19:39:16 -0500
commit327f8f829941e544ef6d97f5ff816d6190c499d1 (patch)
treee2135ea9930cebe63a883229e7aa8d257edb300e /engines/sci/graphics
parent4d3752f9af23b64bb477cb858f7035e299fc0b15 (diff)
downloadscummvm-rg350-327f8f829941e544ef6d97f5ff816d6190c499d1.tar.gz
scummvm-rg350-327f8f829941e544ef6d97f5ff816d6190c499d1.tar.bz2
scummvm-rg350-327f8f829941e544ef6d97f5ff816d6190c499d1.zip
SCI32: Fix potential null pointer dereference
CID 1361026.
Diffstat (limited to 'engines/sci/graphics')
-rw-r--r--engines/sci/graphics/transitions32.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/engines/sci/graphics/transitions32.cpp b/engines/sci/graphics/transitions32.cpp
index c0b1c075c8..b93f0f7917 100644
--- a/engines/sci/graphics/transitions32.cpp
+++ b/engines/sci/graphics/transitions32.cpp
@@ -965,6 +965,10 @@ bool GfxTransitions32::processScroll(PlaneScroll &scroll) {
Plane *plane = g_sci->_gfxFrameout->getPlanes().findByObject(scroll.plane);
+ if (plane == nullptr) {
+ error("[GfxTransitions32::processScroll]: Plane %04x:%04x not found", PRINT_REG(scroll.plane));
+ }
+
if ((scroll.x == 0) && (scroll.y == 0)) {
plane->deletePic(scroll.oldPictureId, scroll.newPictureId);
finished = true;