From ea3c6696e2f9d9c477fdf62439329965a92e946d Mon Sep 17 00:00:00 2001 From: Philippe G Date: Fri, 14 Aug 2020 18:51:59 -0700 Subject: [PATCH] solve memory leak in monitor & potentially http --- components/services/monitor.c | 3 +-- components/wifi-manager/http_server_handlers.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/components/services/monitor.c b/components/services/monitor.c index afa71b93..124e0e5a 100644 --- a/components/services/monitor.c +++ b/components/services/monitor.c @@ -134,8 +134,7 @@ static void monitor_callback(TimerHandle_t xTimer) { messaging_post_message(MESSAGING_INFO, MESSAGING_CLASS_STATS,top_a); FREE_AND_NULL(top_a); } - cJSON_free(top); - + cJSON_Delete(top); } /**************************************************************************************** diff --git a/components/wifi-manager/http_server_handlers.c b/components/wifi-manager/http_server_handlers.c index 799d0ba5..0d50b61d 100644 --- a/components/wifi-manager/http_server_handlers.c +++ b/components/wifi-manager/http_server_handlers.c @@ -481,7 +481,7 @@ esp_err_t console_cmd_get_handler(httpd_req_t *req){ ESP_LOGD_LOC(TAG, "Error retrieving command json string. "); httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Unable to format command"); } - cJSON_free(cmdlist); + cJSON_Delete(cmdlist); ESP_LOGD_LOC(TAG, "done serving [%s]", req->uri); return err; } @@ -1139,7 +1139,7 @@ esp_err_t messages_get_handler(httpd_req_t *req){ CHECK_RESET_FREE_MEM_CHECK(before, "after http send"); free(json_text); CHECK_RESET_FREE_MEM_CHECK(before, "after free json message"); - cJSON_free(json_messages); + cJSON_Delete(json_messages); CHECK_RESET_FREE_MEM_CHECK(before, "after free json"); } else {