From 0430fea572b99a3ee3b262cd66cb68087ee2586b Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Thu, 16 Oct 2025 10:16:32 -1000 Subject: [PATCH] nullptr --- esphome/core/scheduler.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/esphome/core/scheduler.h b/esphome/core/scheduler.h index 59a3fece04..a8ae709824 100644 --- a/esphome/core/scheduler.h +++ b/esphome/core/scheduler.h @@ -289,6 +289,9 @@ class Scheduler { SchedulerItem::Type type, bool match_retry) { size_t count = 0; for (auto &item : container) { + // Skip nullptr items (can happen in defer_queue_ when items are being processed) + if (!item) + continue; if (this->matches_item_(item, component, name_cstr, type, match_retry)) { // Mark item for removal (platform-specific) #ifdef ESPHOME_THREAD_MULTI_ATOMICS @@ -311,6 +314,9 @@ class Scheduler { bool has_cancelled_timeout_in_container_(const Container &container, Component *component, const char *name_cstr, bool match_retry) const { for (const auto &item : container) { + // Skip nullptr items (can happen in defer_queue_ when items are being processed) + if (!item) + continue; if (is_item_removed_(item.get()) && this->matches_item_(item, component, name_cstr, SchedulerItem::TIMEOUT, match_retry, /* skip_removed= */ false)) {