From 522668f1b1963f628721f9f851fb6aba7660bc96 Mon Sep 17 00:00:00 2001
From: fesseha-eve <88329315+fessehaeve@users.noreply.github.com>
Date: Tue, 16 Jul 2024 14:33:24 +0200
Subject: [PATCH] make sure test event trigger delegate is not null before
 using it (#33949)

* - added null check to code which was leading to a fatal error if an app is
  built without setting test event trigger delegate mTestEventTriggerDelegate

* Log warning message when mTestEventTriggerDelegate is null
---
 examples/smoke-co-alarm-app/silabs/src/AppTask.cpp |  5 ++++-
 src/app/server/Server.cpp                          | 14 ++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/examples/smoke-co-alarm-app/silabs/src/AppTask.cpp b/examples/smoke-co-alarm-app/silabs/src/AppTask.cpp
index c9b4a3ab7281f1..dc99728ccf90d5 100644
--- a/examples/smoke-co-alarm-app/silabs/src/AppTask.cpp
+++ b/examples/smoke-co-alarm-app/silabs/src/AppTask.cpp
@@ -78,7 +78,10 @@ CHIP_ERROR AppTask::Init()
     }
 
     // Register Smoke & Co Test Event Trigger
-    Server::GetInstance().GetTestEventTriggerDelegate()->AddHandler(&AlarmMgr());
+    if (Server::GetInstance().GetTestEventTriggerDelegate() != nullptr)
+    {
+        Server::GetInstance().GetTestEventTriggerDelegate()->AddHandler(&AlarmMgr());
+    }
 
     sAlarmLED.Init(LIGHT_LED);
     sAlarmLED.Set(false);
diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp
index a71d797651b418..5be815f0864c95 100644
--- a/src/app/server/Server.cpp
+++ b/src/app/server/Server.cpp
@@ -182,6 +182,10 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams)
     mReportScheduler = initParams.reportScheduler;
 
     mTestEventTriggerDelegate = initParams.testEventTriggerDelegate;
+    if (mTestEventTriggerDelegate == nullptr)
+    {
+        ChipLogProgress(AppServer, "WARNING: mTestEventTriggerDelegate is null");
+    }
 
     deviceInfoprovider = DeviceLayer::GetDeviceInfoProvider();
     if (deviceInfoprovider)
@@ -359,7 +363,10 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams)
                      chip::app::InteractionModelEngine::GetInstance());
 
     // Register Test Event Trigger Handler
-    mTestEventTriggerDelegate->AddHandler(&mICDManager);
+    if (mTestEventTriggerDelegate != nullptr)
+    {
+        mTestEventTriggerDelegate->AddHandler(&mICDManager);
+    }
 
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 
@@ -612,7 +619,10 @@ void Server::Shutdown()
     Credentials::SetGroupDataProvider(nullptr);
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
     // Remove Test Event Trigger Handler
-    mTestEventTriggerDelegate->RemoveHandler(&mICDManager);
+    if (mTestEventTriggerDelegate != nullptr)
+    {
+        mTestEventTriggerDelegate->RemoveHandler(&mICDManager);
+    }
     mICDManager.Shutdown();
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
     mAttributePersister.Shutdown();