github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-21 20:18:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[core] Fix TemplatableValue move: destroy moved-from value for non-trivial T

Browse Source
This commit is contained in:
J. Nick Koston
2026-04-07 13:55:12 -10:00
parent 11934ab27f
commit d0754d1466
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/core/automation.h
+2
View File
@@ -101,6 +101,7 @@ template<typename T, typename... X> class TemplatableValue {
TemplatableValue(TemplatableValue &&other) noexcept : tag_(other.tag_) {
if (this->tag_ == VALUE) {
new (&this->value_) T(std::move(other.value_));
other.destroy_();
} else if (this->tag_ == FN) {
this->f_ = other.f_;
}
@@ -126,6 +127,7 @@ template<typename T, typename... X> class TemplatableValue {
this->tag_ = other.tag_;
if (this->tag_ == VALUE) {
new (&this->value_) T(std::move(other.value_));
other.destroy_();
} else if (this->tag_ == FN) {
this->f_ = other.f_;
}