alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-09-20 00:36:01 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_write_to_null_pointer_if_malloc_failed_issue' into 'master'

Browse Source 
Bugfix/fix write to null pointer if malloc failed issue

Closes IDFGH-7836

See merge request espressif/esp-idf!19087
This commit is contained in:
Chen Jian Xing 2022-07-19 16:32:44 +08:00
commit 4808f9b725
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/wifi/espnow/main/espnow_example_main.c
View File

@ -321,13 +321,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;

3
examples/wifi/ftm/main/ftm_main.c
View File

@ -145,11 +145,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;