Fix for System Layer event handler crash (#6568)

sweetymhaiske · pull[bot] · commit 22865013e59f · 2021-07-09T20:45:06.000Z
diff --git a/src/app/util/af-event.cpp b/src/app/util/af-event.cpp
@@ -144,11 +144,7 @@ static EmberAfEventContext * findEventContext(EndpointId endpoint, ClusterId clu
 
 EmberStatus emberEventControlSetDelayMS(EmberEventControl * control, uint32_t delayMs)
 {
-    if (delayMs == 0)
-    {
-        emberEventControlSetActive(control);
-    }
-    else if (delayMs <= EMBER_MAX_EVENT_CONTROL_DELAY_MS)
+    if (delayMs <= EMBER_MAX_EVENT_CONTROL_DELAY_MS)
     {
         control->status = EMBER_EVENT_MS_TIME;
         chip::DeviceLayer::SystemLayer.StartTimer(delayMs, EventControlHandler, control);

Original file line number	Diff line number	Diff line change
`@@ -144,11 +144,7 @@ static EmberAfEventContext * findEventContext(EndpointId endpoint, ClusterId clu`
`144`	`144`
`145`	`145`	`EmberStatus emberEventControlSetDelayMS(EmberEventControl * control, uint32_t delayMs)`
`146`	`146`	`{`
`147`		`- if (delayMs == 0)`
`148`		`- {`
`149`		`- emberEventControlSetActive(control);`
`150`		`- }`
`151`		`- else if (delayMs <= EMBER_MAX_EVENT_CONTROL_DELAY_MS)`
	`147`	`+ if (delayMs <= EMBER_MAX_EVENT_CONTROL_DELAY_MS)`
`152`	`148`	`{`
`153`	`149`	`control->status = EMBER_EVENT_MS_TIME;`
`154`	`150`	`chip::DeviceLayer::SystemLayer.StartTimer(delayMs, EventControlHandler, control);`