Fix crash caused by latent events (PR #2940)

multitheftauto · May 1, 2023 · 934967f · 934967f
1 parent 2bb5054
commit 934967f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/Shared/mods/deathmatch/logic/CLatentReceiver.cpp b/Shared/mods/deathmatch/logic/CLatentReceiver.cpp
@@ -64,6 +64,15 @@ void CLatentReceiver::OnReceiveError(const SString& strMessage)
 ///////////////////////////////////////////////////////////////
 void CLatentReceiver::OnReceive(NetBitStreamInterface* pBitStream)
 {
+    struct SScopedGuardInsideMark
+    {
+        explicit SScopedGuardInsideMark(CLatentReceiver* pReceiver) noexcept : m_pReceiver(pReceiver) { pReceiver->m_bInside = true; }
+        ~SScopedGuardInsideMark() noexcept { m_pReceiver->m_bInside = false; }
+
+    private:
+        CLatentReceiver* m_pReceiver;
+    } const ScopedInsideMark(this);
+
     //
     // Read header
     //

diff --git a/Shared/mods/deathmatch/logic/CLatentTransferManager.cpp b/Shared/mods/deathmatch/logic/CLatentTransferManager.cpp
@@ -86,13 +86,18 @@ void CLatentTransferManager::RemoveRemote(NetPlayerID remoteId)
 {
     CLatentSendQueue* pSendQueue = FindSendQueueForRemote(remoteId);
     CLatentReceiver*  pReceiver = FindReceiverForRemote(remoteId);
-
     ListRemove(m_SendQueueList, pSendQueue);
     MapRemove(m_SendQueueMap, remoteId);
-    MapRemove(m_ReceiverMap, remoteId);
 
     SAFE_DELETE(pSendQueue);
-    SAFE_DELETE(pReceiver);
+
+    if (pReceiver && pReceiver->IsInside())
+        pReceiver->SetDeferredDelete();
+    else
+    {
+        MapRemove(m_ReceiverMap, remoteId);
+        SAFE_DELETE(pReceiver);
+    }
 }
 
 ///////////////////////////////////////////////////////////////
@@ -293,6 +298,12 @@ void CLatentTransferManager::OnReceive(NetPlayerID remoteId, NetBitStreamInterfa
 {
     CLatentReceiver* pReceiver = GetReceiverForRemote(remoteId, pBitStream->Version());
     pReceiver->OnReceive(pBitStream);
+
+    if (pReceiver->IsDeferredDelete())
+    {
+        MapRemove(m_ReceiverMap, remoteId);
+        SAFE_DELETE(pReceiver);
+    }
 }
 
 ///////////////////////////////////////////////////////////////

diff --git a/Shared/mods/deathmatch/logic/CLatentTransferManager.h b/Shared/mods/deathmatch/logic/CLatentTransferManager.h
@@ -141,18 +141,24 @@ class CLatentSendQueue
 ///////////////////////////////////////////////////////////////
 class CLatentReceiver
 {
+    friend struct SScopedGuardInsideMark;
 public:
     ZERO_ON_NEW
     CLatentReceiver(NetPlayerID remoteId, ushort usBitStreamVersion);
     ~CLatentReceiver();
     void OnReceive(NetBitStreamInterface* pBitStream);
+    bool IsInside() const { return m_bInside; }
+    bool IsDeferredDelete() const { return m_bDeferredDelete; }
+    void SetDeferredDelete() { m_bDeferredDelete = true; }
 
 protected:
     void OnReceiveError(const SString& strMessage);
 
     const NetPlayerID m_RemoteId;
     const ushort      m_usBitStreamVersion;
     SReceiveItem      activeRx;
+    bool              m_bInside{};
+    bool              m_bDeferredDelete{};
 };
 
 ///////////////////////////////////////////////////////////////