github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-10-14 10:12:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Construct the get_name() copy with placement new

Browse Source
This commit is contained in:
J. Nick Koston
2026-10-11 15:39:22 -10:00
parent 543a818307
commit ba9705e19b
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/core/entity_base.cpp
+7 -8
View File
@@ -5,6 +5,8 @@
#include "esphome/core/progmem.h"
#include "esphome/core/string_ref.h"
#include <new>
namespace esphome {
ESPHOME_LOG_TAG(TAG, "entity_base");
@@ -28,16 +30,13 @@ const StringRef &EntityBase::get_name() const {
return copy->ref;
}
size_t len = this->name_.size();
auto *copy = static_cast<NameCopy *>(malloc(sizeof(NameCopy) + len + 1)); // NOLINT(cppcoreguidelines-no-malloc)
if (copy == nullptr)
void *mem = malloc(sizeof(NameCopy) + len + 1); // NOLINT(cppcoreguidelines-no-malloc)
if (mem == nullptr)
return EMPTY_NAME;
char *buf = reinterpret_cast<char *>(copy + 1);
char *buf = static_cast<char *>(mem) + sizeof(NameCopy);
this->name_.write_to(buf, len + 1);
copy->next = name_copies;
copy->key = key;
copy->ref = StringRef(buf, len);
name_copies = copy;
return copy->ref;
name_copies = new (mem) NameCopy{name_copies, key, StringRef(buf, len)};
return name_copies->ref;
}
#endif