Merge pull request #5051 from ab9rf/sizecheck

sizecheck: add safety check
DFHack · Nov 28, 2024 · e1ffa61 · e1ffa61
2 parents 9c37565 + 4532d5c
commit e1ffa61
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/library/Core.cpp b/library/Core.cpp
@@ -1663,6 +1663,9 @@ bool Core::InitMainThread() {
 
         for (auto& gte : *df::global::global_table)
         {
+            // this will exit the loop when the terminator is hit, in the event the global table size in structures is incorrect
+            if (gte.address == nullptr || gte.name == nullptr)
+                break;
             std::string name{ gte.name };
             if (sizechecks.contains(name) && gte.size != sizechecks.at(name))
             {