Merge pull request #4830 from myk002/myk_vtable_null

[VTableInterpose] fix crash when reloading savegames with add-spatter enabled
DFHack · Aug 2, 2024 · c3d36b6 · c3d36b6
2 parents 368e37a + 6f8a689
commit c3d36b6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -64,6 +64,7 @@ Template for new versions:
 - ``Units::isHidingCurse``: don't check ``hunt_target``, which is obsolete
 - ``Units::getReadableName``: correct display of ghost+curse names w/r/t each other and unit prof, use ``curse.name`` instead of iterating syndrome name effects
 - `autodump`: cancel active job on dumped items
+- `add-spatter`: fix a crash related to unloading a savegame with add-spatter reactions, then loading a second savegame with add-spatter reactions
 
 ## Misc Improvements
 - `tweak`: improve performance of ``adamantine-cloth-wear`` tweak

diff --git a/library/VTableInterpose.cpp b/library/VTableInterpose.cpp
@@ -330,6 +330,8 @@ VMethodInterposeLinkBase *VMethodInterposeLinkBase::get_first_interpose(const vi
         return NULL;
 
     auto item = pitem->second;
+    if (!item)
+        return NULL;
 
     if (item->host != id)
         return NULL;