Fix crash on missing symbols.

Fixes #1487.
2020-02-03 20:21:10 -06:00 · 2020-02-03 20:21:10 -06:00 · 321d948f8d
parent 9c52b4e5e6
commit 321d948f8d
2 changed files with 6 additions and 1 deletions
--- a/library/LuaTools.cpp
+++ b/library/LuaTools.cpp
@ -1922,6 +1922,10 @@ static void Lua::Core::InitCoreContext()

 void DFHack::Lua::Core::Reset(color_ostream &out, const char *where)
 {
+    // This can happen if DFHack fails to initialize.
+    if (!State)
+        return;
+
    int top = lua_gettop(State);

    if (top != 0)
--- a/library/include/MemAccess.h
+++ b/library/include/MemAccess.h
@ -254,7 +254,8 @@ namespace DFHack
            };

            void ValidateDescriptionOS() {
-                my_descriptor->ValidateOS();
+                if (my_descriptor)
+                    my_descriptor->ValidateOS();
            };

            uintptr_t getBase();