Crash when ExchangeContext is leaked

project-chip · Apr 21, 2021 · a0639a7 · a0639a7
1 parent 7883312
commit a0639a7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 37 deletions.
diff --git a/src/messaging/ExchangeContext.cpp b/src/messaging/ExchangeContext.cpp
@@ -304,37 +304,6 @@ void ExchangeContext::Free()
     SYSTEM_STATS_DECREMENT(chip::System::Stats::kExchangeMgr_NumContexts);
 }
 
-void ExchangeContext::ForceFree()
-{
-    VerifyOrDie(mExchangeMgr != nullptr);
-
-    ExchangeManager * em = mExchangeMgr;
-
-    if (mDelegate != nullptr)
-    {
-        mDelegate->OnExchangeClosing(this);
-    }
-    mDelegate = nullptr;
-
-    CancelResponseTimer();
-
-    mExchangeMgr = nullptr;
-
-    em->DecrementContextsInUse();
-
-    if (mExchangeACL != nullptr)
-    {
-        chip::Platform::Delete(mExchangeACL);
-        mExchangeACL = nullptr;
-    }
-
-#if defined(CHIP_EXCHANGE_CONTEXT_DETAIL_LOGGING)
-    ChipLogProgress(ExchangeManager, "ec-- id: %d [%04" PRIX16 "], inUse: %d, addr: 0x%x", (this - em->ContextPool + 1),
-                    mExchangeId, em->GetContextsInUse(), this);
-#endif
-    SYSTEM_STATS_DECREMENT(chip::System::Stats::kExchangeMgr_NumContexts);
-}
-
 bool ExchangeContext::MatchExchange(SecureSessionHandle session, const PacketHeader & packetHeader,
                                     const PayloadHeader & payloadHeader)
 {

diff --git a/src/messaging/ExchangeContext.h b/src/messaging/ExchangeContext.h
@@ -186,7 +186,6 @@ class DLL_EXPORT ExchangeContext : public ReliableMessageContext,
                             ExchangeDelegateBase * delegate);
     void Free();
     void Reset();
-    void ForceFree();
 
     void SetResponseTimeout(Timeout timeout);
 

diff --git a/src/messaging/ExchangeMgr.cpp b/src/messaging/ExchangeMgr.cpp
@@ -104,11 +104,8 @@ CHIP_ERROR ExchangeManager::Shutdown()
 
     for (auto & ec : mContextPool)
     {
-        if (ec.GetReferenceCount() > 0)
-        {
-            ChipLogError(ExchangeManager, "Exchange (id: %d) leaked", ec.GetExchangeId());
-            ec.ForceFree();
-        }
+        // ExchangeContext leaked
+        assert(ec.GetReferenceCount() == 0);
     }
 
     if (mSessionMgr != nullptr)