jeans/esphome
jeans/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-08-03 17:07:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

address bot comments

Browse Source
This commit is contained in:
J. Nick Koston 2025-07-14 12:29:40 -10:00
parent a714e8da0b
commit 52d6801618
No known key found for this signature in database
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
esphome/components/http_request/update/http_request_update.cpp
View File

@ -83,8 +83,7 @@ void HttpRequestUpdate::update_task(void *params) {
container.reset(); // Release ownership of the container's shared_ptr container.reset(); // Release ownership of the container's shared_ptr
valid = json::parse_json(response, [this_update](JsonObject root) -> bool { valid = json::parse_json(response, [this_update](JsonObject root) -> bool {
if (!root["name"].is<const char *>() || !root["version"].is<const char *>() || if (!root["name"].is<const char *>() || !root["version"].is<const char *>() || !root["builds"].is<JsonArray>()) {
!root["builds"].is<const char *>()) {
ESP_LOGE(TAG, "Manifest does not contain required fields"); ESP_LOGE(TAG, "Manifest does not contain required fields");
return false; return false;
} }

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

@ -1,7 +1,7 @@
#include "json_util.h" #include "json_util.h"
#include "esphome/core/log.h" #include "esphome/core/log.h"
#include <ArduinoJson/Memory/Allocator.hpp> // ArduinoJson::Allocator is included via ArduinoJson.h in json_util.h
namespace esphome { namespace esphome {
namespace json { namespace json {
@ -13,7 +13,11 @@ struct SpiRamAllocator : ArduinoJson::Allocator {
void *allocate(size_t size) override { return this->allocator_.allocate(size); } void *allocate(size_t size) override { return this->allocator_.allocate(size); }
void deallocate(void *pointer) override { void deallocate(void *pointer) override {
// RAMAllocator requires passing the size of the allocated space which don't know, so use free directly // ArduinoJson's Allocator interface doesn't provide the size parameter in deallocate.
// RAMAllocator::deallocate() requires the size, which we don't have access to here.
// Since RAMAllocator internally uses malloc/free for NONE mode (PSRAM allocation),
// it's safe to use free() directly. The memory was allocated via malloc in
// RAMAllocator::allocate() when using NONE mode.
free(pointer); // NOLINT(cppcoreguidelines-owning-memory,cppcoreguidelines-no-malloc) free(pointer); // NOLINT(cppcoreguidelines-owning-memory,cppcoreguidelines-no-malloc)
} }