esp_event: fix crash when unregistering a handler instance in itself
When a handler instance is the last one in the list und unregisters
itself, the handler iterator will be invalidated by entering free'd
memory. Same applies for event base and id, if they become empty.
Merges
@@ -526,30 +526,30 @@ esp_err_t esp_event_loop_run(esp_event_loop_handle_t event_loop, TickType_t tick
bool exec = false;
- esp_event_handler_instance_t *handler;
+ esp_event_handler_instance_t *handler, *temp_handler;
esp_event_loop_node_t *loop_node;
- esp_event_base_node_t *base_node;
- esp_event_id_node_t *id_node;
+ esp_event_base_node_t *base_node, *temp_base;
+ esp_event_id_node_t *id_node, *temp_id_node;
SLIST_FOREACH(loop_node, &(loop->loop_nodes), next) {
// Execute loop level handlers
- SLIST_FOREACH(handler, &(loop_node->handlers), next) {
+ SLIST_FOREACH_SAFE(handler, &(loop_node->handlers), next, temp_handler) {
handler_execute(loop, handler, post);
exec |= true;
}
- SLIST_FOREACH(base_node, &(loop_node->base_nodes), next) {
+ SLIST_FOREACH_SAFE(base_node, &(loop_node->base_nodes), next, temp_base) {
if (base_node->base == post.base) {
// Execute base level handlers
- SLIST_FOREACH(handler, &(base_node->handlers), next) {
+ SLIST_FOREACH_SAFE(handler, &(base_node->handlers), next, temp_handler) {
handler_execute(loop, handler, post);
exec |= true;
}
- SLIST_FOREACH(id_node, &(base_node->id_nodes), next) {
+ SLIST_FOREACH_SAFE(id_node, &(base_node->id_nodes), next, temp_id_node) {
if (id_node->id == post.id) {
// Execute id level handlers
- SLIST_FOREACH(handler, &(id_node->handlers), next) {
+ SLIST_FOREACH_SAFE(handler, &(id_node->handlers), next, temp_handler) {
handler_execute(loop, handler, post);
exec |= true;
}
