sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-12 06:43:48 +01:00
Code Issues Releases Wiki Activity

[json] Fix PSRAM allocator dangling pointer crash (#11165)

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-10 11:18:57 -10:00
committed by GitHub
parent be51093a7e
commit 6abc2efd96
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,13 @@ namespace json {
static const char *const TAG = "json"; static const char *const TAG = "json";
#ifdef USE_PSRAM
// Global allocator that outlives all JsonDocuments returned by parse_json()
// This prevents dangling pointer issues when JsonDocuments are returned from functions
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables) - Must be mutable for ArduinoJson::Allocator
static SpiRamAllocator global_json_allocator;
#endif
std::string build_json(const json_build_t &f) { std::string build_json(const json_build_t &f) {
// NOLINTBEGIN(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson // NOLINTBEGIN(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
JsonBuilder builder; JsonBuilder builder;
@@ -33,8 +40,7 @@ JsonDocument parse_json(const uint8_t *data, size_t len) {
return JsonObject(); // return unbound object return JsonObject(); // return unbound object
} }
#ifdef USE_PSRAM #ifdef USE_PSRAM
auto doc_allocator = SpiRamAllocator(); JsonDocument json_document(&global_json_allocator);
JsonDocument json_document(&doc_allocator);
#else #else
JsonDocument json_document; JsonDocument json_document;
#endif #endif