sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-31 07:03:55 +00:00
Code Issues Releases Wiki Activity

preen

Browse Source
This commit is contained in:
J. Nick Koston
2025-07-06 21:23:30 -05:00
parent ecb99cbcce
commit bb51031ec6
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
esphome/core/scheduler.cpp
View File

@@ -68,7 +68,7 @@ void HOT Scheduler::set_timer_common_(Component *component, SchedulerItem::Type
// Still need to cancel existing timer if name is not empty // Still need to cancel existing timer if name is not empty
if (name_cstr != nullptr && name_cstr[0] != '\0') { if (name_cstr != nullptr && name_cstr[0] != '\0') {
LockGuard guard{this->lock_}; LockGuard guard{this->lock_};
this->cancel_item_locked_(component, name_cstr, type, delay == 0 && type == SchedulerItem::TIMEOUT); this->cancel_item_locked_(component, name_cstr, type, false);
} }
return; return;
} }
@@ -451,7 +451,7 @@ bool HOT Scheduler::cancel_item_(Component *component, bool is_static_string, co
// Helper to cancel items by name - must be called with lock held // Helper to cancel items by name - must be called with lock held
bool HOT Scheduler::cancel_item_locked_(Component *component, const char *name_cstr, SchedulerItem::Type type, bool HOT Scheduler::cancel_item_locked_(Component *component, const char *name_cstr, SchedulerItem::Type type,
bool defer_only) { bool check_defer_only) {
size_t total_cancelled = 0; size_t total_cancelled = 0;
// Check all containers for matching items // Check all containers for matching items
@@ -464,7 +464,7 @@ bool HOT Scheduler::cancel_item_locked_(Component *component, const char *name_c
total_cancelled++; total_cancelled++;
} }
} }
if (defer_only) { if (check_defer_only) {
return total_cancelled > 0; return total_cancelled > 0;
} }
} }

10
esphome/core/scheduler.h
View File

@@ -99,13 +99,7 @@ class Scheduler {
SchedulerItem(const SchedulerItem &) = delete; SchedulerItem(const SchedulerItem &) = delete;
SchedulerItem &operator=(const SchedulerItem &) = delete; SchedulerItem &operator=(const SchedulerItem &) = delete;
// Delete move operations to prevent accidental moves of SchedulerItem objects. // Delete move operations: SchedulerItem objects are only managed via unique_ptr, never moved directly
// This is intentional because:
// 1. SchedulerItem contains a dynamically allocated name that requires careful ownership management
// 2. The scheduler only moves unique_ptr<SchedulerItem>, never SchedulerItem objects directly
// 3. Moving unique_ptr only transfers pointer ownership without moving the pointed-to object
// 4. Deleting these operations makes it explicit that SchedulerItem objects should not be moved
// 5. This prevents potential double-free bugs if the code is refactored to move SchedulerItem objects
SchedulerItem(SchedulerItem &&) = delete; SchedulerItem(SchedulerItem &&) = delete;
SchedulerItem &operator=(SchedulerItem &&) = delete; SchedulerItem &operator=(SchedulerItem &&) = delete;
@@ -149,7 +143,7 @@ class Scheduler {
private: private:
// Helper to cancel items by name - must be called with lock held // Helper to cancel items by name - must be called with lock held
bool cancel_item_locked_(Component *component, const char *name, SchedulerItem::Type type, bool defer_only); bool cancel_item_locked_(Component *component, const char *name, SchedulerItem::Type type, bool check_defer_only);
// Helper to extract name as const char* from either static string or std::string // Helper to extract name as const char* from either static string or std::string
inline const char *get_name_cstr_(bool is_static_string, const void *name_ptr) { inline const char *get_name_cstr_(bool is_static_string, const void *name_ptr) {