Add logging for issue #1077

multitheftauto · Aug 28, 2019 · 0c3975f · 0c3975f · botder · Sep 24, 2019
1 parent f2407e7
commit 0c3975f
Showing 1 changed file with 29 additions and 0 deletions.
diff --git a/Client/mods/deathmatch/logic/CPacketHandler.cpp b/Client/mods/deathmatch/logic/CPacketHandler.cpp
@@ -4832,10 +4832,28 @@ void CPacketHandler::Packet_ResourceStart(NetBitStreamInterface& bitStream)
     // Get the resource dynamic entity
     CClientEntity* pResourceDynamicEntity = CElementIDs::GetElement(ResourceDynamicEntityID);
 
+    if (!pResourceEntity || !pResourceDynamicEntity)
+    {
+        // Crash investigation code for forced crash in CResource::Load() at `assert(0);` - m_pResourceEntity is null
+        WriteDebugEvent(SString("Packet_ResourceStart() [1] - pResourceEntity: %p (ID: %u), pResourceDynamicEntity: %p (ID: %u)", pResourceEntity,
+                                ResourceEntityID.Value(), pResourceDynamicEntity, ResourceDynamicEntityID.Value()));
+        assert(false);
+        return;
+    }
+
     CResource* pResource = g_pClientGame->m_pResourceManager->Add(usResourceID, szResourceName, pResourceEntity, pResourceDynamicEntity, strMinServerReq,
                                                                   strMinClientReq, bEnableOOP);
     if (pResource)
     {
+        if (!pResource->GetResourceEntity())
+        {
+            // Crash investigation code for forced crash in CResource::Load() at `assert(0);` - m_pResourceEntity is null
+            WriteDebugEvent(SString("Packet_ResourceStart() [2] - pResourceEntity: %p (ID: %u), pResourceDynamicEntity: %p (ID: %u)", pResourceEntity,
+                                    ResourceEntityID.Value(), pResourceDynamicEntity, ResourceDynamicEntityID.Value()));
+            assert(false);
+            return;
+        }
+
         pResource->SetRemainingNoClientCacheScripts(usNoClientCacheScriptCount);
         pResource->SetDownloadPriorityGroup(iDownloadPriorityGroup);
 
@@ -4958,7 +4976,18 @@ void CPacketHandler::Packet_ResourceStart(NetBitStreamInterface& bitStream)
         {
             // Load the resource now
             if (pResource->CanBeLoaded())
+            {
+                if (!pResource->GetResourceEntity())
+                {
+                    // Crash investigation code for forced crash in CResource::Load() at `assert(0);` - m_pResourceEntity is null
+                    WriteDebugEvent(SString("Packet_ResourceStart() [3] - pResourceEntity: %p (ID: %u), pResourceDynamicEntity: %p (ID: %u)", pResourceEntity,
+                                            ResourceEntityID.Value(), pResourceDynamicEntity, ResourceDynamicEntityID.Value()));
+                    assert(false);
+                    return;
+                }
+
                 pResource->Load();
+            }
         }
     }