[Scummvm-cvs-logs] scummvm master -> 52bcc9dd25e43321ddc662e8dc3fa9c1a87c9542

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
52bcc9dd25 CRUISE: Fix a null pointer dereference


Commit: 52bcc9dd25e43321ddc662e8dc3fa9c1a87c9542
    https://github.com/scummvm/scummvm/commit/52bcc9dd25e43321ddc662e8dc3fa9c1a87c9542
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-06-07T12:13:30+02:00

Commit Message:
CRUISE: Fix a null pointer dereference

Changed paths:
    engines/cruise/cruise_main.cpp



diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp
index c00f8a5..d7f5871 100644
--- a/engines/cruise/cruise_main.cpp
+++ b/engines/cruise/cruise_main.cpp
@@ -909,14 +909,14 @@ bool createDialog(int objOvl, int objIdx, int x, int y) {
 						if (obj2Ovl > 0)
 							ovl4 = overlayTable[obj2Ovl].ovlData;
 
-						if ((ovl3) && (ptrHead->obj1Number >= 0)) {
+						if (ovl3 && (ptrHead->obj1Number >= 0)) {
 							testState1 = ptrHead->obj1OldState;
 						}
-						if ((ovl4) && (ptrHead->obj2Number >= 0)) {
+						if (ovl4 && (ptrHead->obj2Number >= 0)) {
 							testState2 = ptrHead->obj2OldState;
 						}
 
-						if ((ovl4) && (ptrHead->verbNumber >= 0) &&
+						if (ovl4 && ovl2 && (ptrHead->verbNumber >= 0) &&
 						        ((testState1 == -1) || (testState1 == objectState2)) &&
 						        ((testState2 == -1) || (testState2 == objectState))) {
 							if (ovl2->nameVerbGlob) {