From 007381cf82572cb8349a41e2bac6521be4cf8e24 Mon Sep 17 00:00:00 2001 From: Oleg Savchenko Date: Fri, 15 Jul 2022 23:55:59 +0300 Subject: [PATCH 1/2] fix write to null pointer if malloc failed --- examples/wifi/espnow/main/espnow_example_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/wifi/espnow/main/espnow_example_main.c b/examples/wifi/espnow/main/espnow_example_main.c index a99f9f673d..708a186043 100644 --- a/examples/wifi/espnow/main/espnow_example_main.c +++ b/examples/wifi/espnow/main/espnow_example_main.c @@ -318,13 +318,13 @@ static esp_err_t example_espnow_init(void) /* Initialize sending parameters. */ send_param = malloc(sizeof(example_espnow_send_param_t)); - memset(send_param, 0, sizeof(example_espnow_send_param_t)); if (send_param == NULL) { ESP_LOGE(TAG, "Malloc send parameter fail"); vSemaphoreDelete(s_example_espnow_queue); esp_now_deinit(); return ESP_FAIL; } + memset(send_param, 0, sizeof(example_espnow_send_param_t)); send_param->unicast = false; send_param->broadcast = true; send_param->state = 0; From 2c59eb0bca8d6939669cfb0f32b034b8a8cddb1c Mon Sep 17 00:00:00 2001 From: Oleg Savchenko Date: Sun, 17 Jul 2022 11:24:12 +0300 Subject: [PATCH 2/2] fix possible memory leak if report level not set --- examples/wifi/ftm/main/ftm_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/wifi/ftm/main/ftm_main.c b/examples/wifi/ftm/main/ftm_main.c index fe3e2bec3d..c7a9a21d79 100644 --- a/examples/wifi/ftm/main/ftm_main.c +++ b/examples/wifi/ftm/main/ftm_main.c @@ -144,11 +144,12 @@ static void event_handler(void *arg, esp_event_base_t event_base, static void ftm_process_report(void) { int i; - char *log = malloc(200); + char *log = NULL; if (!g_report_lvl) return; + log = malloc(200); if (!log) { ESP_LOGE(TAG_STA, "Failed to alloc buffer for FTM report"); return;