From a08048da4ebf4f4dce102f7ef2114e11c40ea111 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Wed, 1 Aug 2018 19:30:30 +0400
Subject: [PATCH] Avoid dereference after null check

---
 apps/openmw/mwgui/container.cpp        | 2 +-
 apps/openmw/mwgui/windowmanagerimp.cpp | 3 ++-
 apps/openmw/mwworld/worldimp.cpp       | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp
index 9222f1d02..7f36bf001 100644
--- a/apps/openmw/mwgui/container.cpp
+++ b/apps/openmw/mwgui/container.cpp
@@ -82,7 +82,7 @@ namespace MWGui
             dialog->eventOkClicked.clear();
             dialog->eventOkClicked += MyGUI::newDelegate(this, &ContainerWindow::dragItem);
         }
-        else
+        else if (mModel)
             dragItem (NULL, count);
     }
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index df2d5ed6d..c97efed34 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -898,7 +898,8 @@ namespace MWGui
 
         mKeyboardNavigation->onFrame();
 
-        mMessageBoxManager->onFrame(frameDuration);
+        if (mMessageBoxManager)
+            mMessageBoxManager->onFrame(frameDuration);
 
         mToolTips->onFrame(frameDuration);
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index c162fd57d..f4c2a75f3 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1180,9 +1180,9 @@ namespace MWWorld
                 addContainerScripts (getPlayerPtr(), newCell);
                 newPtr = getPlayerPtr();
             }
-            else
+            else if (currCell)
             {
-                bool currCellActive = currCell && mWorldScene->isCellActive(*currCell);
+                bool currCellActive = mWorldScene->isCellActive(*currCell);
                 bool newCellActive = newCell && mWorldScene->isCellActive(*newCell);
                 if (!currCellActive && newCellActive)
                 {