Skip to content

Commit 9a219b3

Browse files
committed
Don't die when Fail-Safe is armed when checking for AddNOCStartedMarker
This situation should not be possible, however it may lead to bootloop. Log error and return instead. Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
1 parent 1211af8 commit 9a219b3

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/app/FailSafeContext.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,11 @@ void FailSafeContext::CheckAddNOCStartedMarker()
6868
if (err == CHIP_NO_ERROR)
6969
{
7070
// This should not be possible at this point
71-
VerifyOrDie(IsFailSafeArmed() == false);
71+
if (IsFailSafeArmed())
72+
{
73+
ChipLogError(FailSafe, "Found a AddNOCStartedMarker, but Fail-Safe is armed. Something went wrong.");
74+
return;
75+
}
7276

7377
// Fail-Safe may be busy due to cleanup scheduled by failed commit to FabricTable.
7478
// We can ignore it here, AddNOCStartedMarker will be deleted when Fail-Safe is disarmed.

0 commit comments

Comments
 (0)