sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-11-17 15:26:01 +00:00
Code Issues Releases Wiki Activity

Merge branch 'integration' into memory_api

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-30 15:27:58 -05:00
parent 94207cb956 b6b640cd33
commit 74a9445eff
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
esphome/components/select/select_call.cpp
View File

@@ -46,7 +46,12 @@ SelectCall &SelectCall::with_option(const char *option) {
} }
SelectCall &SelectCall::with_index(size_t index) { SelectCall &SelectCall::with_index(size_t index) {
if (index >= this->parent_->size()) {
ESP_LOGW(TAG, "'%s' - Index value %zu out of bounds", this->parent_->get_name().c_str(), index);
this->index_ = {}; // Store nullopt for invalid index
} else {
this->index_ = index; this->index_ = index;
}
return *this; return *this;
} }
@@ -71,12 +76,7 @@ optional<size_t> SelectCall::calculate_target_index_(const char *name) {
ESP_LOGW(TAG, "'%s' - No option set", name); ESP_LOGW(TAG, "'%s' - No option set", name);
return {}; return {};
} }
auto idx = this->index_.value(); return this->index_.value();
if (idx >= options.size()) {
ESP_LOGW(TAG, "'%s' - Index value %zu out of bounds", name, idx);
return {};
}
return idx;
} }
// SELECT_OP_NEXT or SELECT_OP_PREVIOUS // SELECT_OP_NEXT or SELECT_OP_PREVIOUS
@@ -114,6 +114,7 @@ void SelectCall::perform() {
return; return;
} }
// Calculate target index (with_index() and with_option() already validate bounds/existence)
auto target_index = this->calculate_target_index_(name); auto target_index = this->calculate_target_index_(name);
if (!target_index.has_value()) { if (!target_index.has_value()) {
return; return;