fix: crashes in inventory and projectile systems

tiltedphoques · May 1, 2022 · 6a0ef9c · 6a0ef9c
1 parent 7d5b60a
commit 6a0ef9c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/Code/client/Games/Skyrim/Projectiles/Projectile.cpp b/Code/client/Games/Skyrim/Projectiles/Projectile.cpp
@@ -17,11 +17,21 @@ BSPointerHandle<Projectile>* Projectile::Launch(BSPointerHandle<Projectile>* apR
     BSPointerHandle<Projectile>* result = ThisCall(RealLaunch, apResult, apLaunchData);
 
     TP_ASSERT(result, "No projectile handle returned.");
+    if (!result)
+    {
+        spdlog::error("No projectile handle returned.");
+        return nullptr;
+    }
 
     TESObjectREFR* pObject = TESObjectREFR::GetByHandle(result->handle.iBits);
     Projectile* pProjectile = Cast<Projectile>(pObject);
 
     TP_ASSERT(pProjectile, "No projectile found.");
+    if (!pProjectile)
+    {
+        spdlog::error("No projectile found.");
+        return nullptr;
+    }
 
     pProjectile->fPower = apLaunchData.fPower;
 

diff --git a/Code/client/Services/Generic/InventoryService.cpp b/Code/client/Services/Generic/InventoryService.cpp
@@ -163,6 +163,12 @@ void InventoryService::OnNotifyEquipmentChanges(const NotifyEquipmentChanges& ac
     uint32_t itemId = modSystem.GetGameId(acMessage.ItemId);
     TESForm* pItem = TESForm::GetById(itemId);
 
+    if (!pItem)
+    {
+        spdlog::error("Could not find inventory item {:X}:{:X}", acMessage.ItemId.ModId, acMessage.ItemId.BaseId);
+        return;
+    }
+
     uint32_t equipSlotId = modSystem.GetGameId(acMessage.EquipSlotId);
     TESForm* pEquipSlot = TESForm::GetById(equipSlotId);