commit afa79dec1a02473772c3fe660d3d7adb1c1899e8
author Boris Zbarsky <bzbarsky@apple.com> Tue Feb 14 09:40:13 2023 -0500
committer GitHub <noreply@github.com> Tue Feb 14 09:40:13 2023 -0500
tree 38f5d4b1cb6591f0a215b0e397889934ba3da825
parent 62d91872d4fc119f591fad8c4e62b8c28e097dfc

Make sure that Server init and shutdown happen with the stack lock held. (#25041)

src/app/server/Server.cpp

diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp
index c41f5c3..c1d6d25 100644
--- a/src/app/server/Server.cpp
+++ b/src/app/server/Server.cpp
@@ -43,6 +43,7 @@
 #include <platform/DeviceControlServer.h>
 #include <platform/DeviceInfoProvider.h>
 #include <platform/KeyValueStoreManager.h>
+#include <platform/LockTracker.h>
 #include <protocols/secure_channel/CASEServer.h>
 #include <protocols/secure_channel/MessageCounterManager.h>
 #include <setup_payload/SetupPayload.h>
@@ -105,6 +106,7 @@
 CHIP_ERROR Server::Init(const ServerInitParams & initParams)
 {
     ChipLogProgress(AppServer, "Server initializing...");
+    assertChipStackLockedByCurrentThread();
 
     CASESessionManagerConfig caseSessionManagerConfig;
     DeviceLayer::DeviceInfoProvider * deviceInfoprovider = nullptr;
@@ -461,6 +463,7 @@
 
 void Server::Shutdown()
 {
+    assertChipStackLockedByCurrentThread();
     PlatformMgr().RemoveEventHandler(OnPlatformEventWrapper, 0);
     mCASEServer.Shutdown();
     mCASESessionManager.Shutdown();