sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-02-08 08:41:59 +00:00
Code Issues Releases Wiki Activity

private implementation details

Browse Source
This commit is contained in:
J. Nick Koston
2026-01-29 18:45:18 -06:00
parent 5fbd9d5b14
commit cfe121b38b
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
esphome/components/json/json_util.cpp
View File

@@ -98,24 +98,24 @@ SerializationBuffer<> JsonBuilder::serialize() {
if (doc_.overflowed()) {
ESP_LOGE(TAG, "JSON document overflow");
auto *buf = result.data_writable();
auto *buf = result.data_writable_();
buf[0] = '{';
buf[1] = '}';
buf[2] = '\0';
result.set_size(2);
result.set_size_(2);
return result;
}
size_t size = serializeJson(doc_, result.data_writable(), buf_size);
size_t size = serializeJson(doc_, result.data_writable_(), buf_size);
if (size < buf_size) {
// Fits in stack buffer - update size to actual length
result.set_size(size);
result.set_size_(size);
return result;
}
// Needs heap allocation - reallocate and serialize again with exact size
result.reallocate_heap_(size);
serializeJson(doc_, result.data_writable(), size + 1);
serializeJson(doc_, result.data_writable_(), size + 1);
return result;
}

17
esphome/components/json/json_util.h
View File

@@ -84,16 +84,23 @@ template<size_t STACK_SIZE = 768> class SerializationBuffer {
const char *data() const { return buffer_; }
/// Get string length (excluding null terminator)
size_t size() const { return size_; }
/// Get writable buffer (for serialization)
char *data_writable() { return buffer_; }
/// Set actual size after serialization (must not exceed allocated size)
void set_size(size_t size) { size_ = size; }
/// Implicit conversion to std::string for backward compatibility
/// WARNING: This allocates a new std::string on the heap. Prefer using
/// c_str() or data()/size() directly when possible to avoid allocation.
operator std::string() const { return std::string(buffer_, size_); } // NOLINT(google-explicit-constructor)
private:
friend class JsonBuilder; ///< Allows JsonBuilder::serialize() to call reallocate_heap_()
friend class JsonBuilder; ///< Allows JsonBuilder::serialize() to call private methods
/// Get writable buffer (for serialization)
char *data_writable_() { return buffer_; }
/// Set actual size after serialization (must not exceed allocated size)
/// Also ensures null termination for c_str() safety
void set_size_(size_t size) {
size_ = size;
buffer_[size] = '\0';
}
/// Reallocate to heap buffer with new size (for when stack buffer is too small)
/// This invalidates any previous buffer content. Used by JsonBuilder::serialize().