jeans/esphome
jeans/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-08-09 11:57:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
J. Nick Koston 2025-06-29 15:08:27 -05:00
parent c17503abd5
commit 3162bb475d
No known key found for this signature in database
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
esphome/components/web_server_idf/web_server_idf.cpp
View File

@ -1,6 +1,7 @@
#ifdef USE_ESP_IDF #ifdef USE_ESP_IDF
#include <cstdarg> #include <cstdarg>
#include <memory>
#include "esphome/core/helpers.h" #include "esphome/core/helpers.h"
#include "esphome/core/log.h" #include "esphome/core/log.h"
@ -134,7 +135,7 @@ esp_err_t AsyncWebServer::request_post_handler(httpd_req_t *r) {
// Handle multipart upload using the multipart-parser library // Handle multipart upload using the multipart-parser library
MultipartReader reader(boundary); MultipartReader reader(boundary);
static constexpr size_t CHUNK_SIZE = 1024; static constexpr size_t CHUNK_SIZE = 1024;
char *chunk_buf = new char[CHUNK_SIZE]; std::unique_ptr<char[]> chunk_buf(new char[CHUNK_SIZE]);
size_t total_len = r->content_len; size_t total_len = r->content_len;
size_t remaining = total_len; size_t remaining = total_len;
std::string current_filename; std::string current_filename;
@ -160,10 +161,9 @@ esp_err_t AsyncWebServer::request_post_handler(httpd_req_t *r) {
while (remaining > 0) { while (remaining > 0) {
size_t to_read = std::min(remaining, CHUNK_SIZE); size_t to_read = std::min(remaining, CHUNK_SIZE);
int recv_len = httpd_req_recv(r, chunk_buf, to_read); int recv_len = httpd_req_recv(r, chunk_buf.get(), to_read);
if (recv_len <= 0) { if (recv_len <= 0) {
delete[] chunk_buf;
if (recv_len == HTTPD_SOCK_ERR_TIMEOUT) { if (recv_len == HTTPD_SOCK_ERR_TIMEOUT) {
httpd_resp_send_err(r, HTTPD_408_REQ_TIMEOUT, nullptr); httpd_resp_send_err(r, HTTPD_408_REQ_TIMEOUT, nullptr);
return ESP_ERR_TIMEOUT; return ESP_ERR_TIMEOUT;
@ -173,10 +173,9 @@ esp_err_t AsyncWebServer::request_post_handler(httpd_req_t *r) {
} }
// Parse multipart data // Parse multipart data
size_t parsed = reader.parse(chunk_buf, recv_len); size_t parsed = reader.parse(chunk_buf.get(), recv_len);
if (parsed != recv_len) { if (parsed != recv_len) {
ESP_LOGW(TAG, "Multipart parser error at byte %zu", total_len - remaining + parsed); ESP_LOGW(TAG, "Multipart parser error at byte %zu", total_len - remaining + parsed);
delete[] chunk_buf;
httpd_resp_send_err(r, HTTPD_400_BAD_REQUEST, nullptr); httpd_resp_send_err(r, HTTPD_400_BAD_REQUEST, nullptr);
return ESP_FAIL; return ESP_FAIL;
} }
@ -194,8 +193,6 @@ esp_err_t AsyncWebServer::request_post_handler(httpd_req_t *r) {
found_handler->handleUpload(&req, current_filename, 2, nullptr, 0, true); found_handler->handleUpload(&req, current_filename, 2, nullptr, 0, true);
} }
delete[] chunk_buf;
// Let handler send response // Let handler send response
found_handler->handleRequest(&req); found_handler->handleRequest(&req);
return ESP_OK; return ESP_OK;