From 8490dcd2dc4e26aeb26e41c60774ed7c8da424df Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Thu, 21 Dec 2023 08:29:03 +1100 Subject: [PATCH] [Bugfix] Ensure we only clear the deferred executor slot if the corresponding callback hadn't already cleared it. --- quantum/deferred_exec.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/quantum/deferred_exec.c b/quantum/deferred_exec.c index a0046a9648d6..b3be3747d47d 100644 --- a/quantum/deferred_exec.c +++ b/quantum/deferred_exec.c @@ -124,13 +124,19 @@ void deferred_exec_advanced_task(deferred_executor_t *table, size_t table_count, // Run through each of the executors for (int i = 0; i < table_count; ++i) { - deferred_executor_t *entry = &table[i]; + deferred_executor_t *entry = &table[i]; + deferred_token curr_token = entry->token; // Check if we're supposed to execute this entry - if (entry->token != INVALID_DEFERRED_TOKEN && ((int32_t)TIMER_DIFF_32(entry->trigger_time, now)) <= 0) { + if (curr_token != INVALID_DEFERRED_TOKEN && ((int32_t)TIMER_DIFF_32(entry->trigger_time, now)) <= 0) { // Invoke the callback and work work out if we should be requeued uint32_t delay_ms = entry->callback(entry->trigger_time, entry->cb_arg); + // If the token has changed, then the callback has canceled and re-queued. Skip further processing. + if (entry->token != curr_token) { + continue; + } + // Update the trigger time if we have to repeat, otherwise clear it out if (delay_ms > 0) { // Intentionally add just the delay to the existing trigger time -- this ensures the next