Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make sure test event trigger delegate is not null before using it #33949

Merged
merged 2 commits into from
Jul 16, 2024
Merged

make sure test event trigger delegate is not null before using it #33949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
009736b
- added null check to code which was leading to a fatal error if an a…
fessehaeve Jun 17, 2024
82f7cd9
Log warning message when mTestEventTriggerDelegate is null
fessehaeve Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion examples/smoke-co-alarm-app/silabs/src/AppTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
14 changes: 12 additions & 2 deletions src/app/server/Server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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();
Expand Down
Loading