From 0bfa176435fb16601cc7a10eb6bbcb6f24f79bd8 Mon Sep 17 00:00:00 2001
From: muhaidong <muhaidong@espressif.com>
Date: Sat, 3 Feb 2024 16:29:26 +0800
Subject: [PATCH] fix(wifi): fix esp_wifi_scan_start memory leakage issue

Closes https://github.com/espressif/esp-idf/issues/10693
---
 components/wifi_provisioning/src/manager.c              | 1 +
 components/wpa_supplicant/esp_supplicant/src/esp_scan.c | 7 ++-----
 examples/bluetooth/blufi/main/blufi_example_main.c      | 1 +
 examples/wifi/ftm/main/ftm_main.c                       | 1 +
 examples/wifi/iperf/main/cmd_wifi.c                     | 1 +
 examples/wifi/roaming/main/roaming_example.c            | 4 +---
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/components/wifi_provisioning/src/manager.c b/components/wifi_provisioning/src/manager.c
index ad78af5a5c..55696d43e0 100644
--- a/components/wifi_provisioning/src/manager.c
+++ b/components/wifi_provisioning/src/manager.c
@@ -706,6 +706,7 @@ static esp_err_t update_wifi_scan_results(void)
     prov_ctx->ap_list[curr_channel] = (wifi_ap_record_t *) calloc(get_count, sizeof(wifi_ap_record_t));
     if (!prov_ctx->ap_list[curr_channel]) {
         ESP_LOGE(TAG, "Failed to allocate memory for AP list");
+        esp_wifi_clear_ap_list();
         goto exit;
     }
     if (esp_wifi_scan_get_ap_records(&get_count, prov_ctx->ap_list[curr_channel]) != ESP_OK) {
diff --git a/components/wpa_supplicant/esp_supplicant/src/esp_scan.c b/components/wpa_supplicant/esp_supplicant/src/esp_scan.c
index a391708732..d3f2030c71 100644
--- a/components/wpa_supplicant/esp_supplicant/src/esp_scan.c
+++ b/components/wpa_supplicant/esp_supplicant/src/esp_scan.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2020-2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2020-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -63,13 +63,10 @@ static void handle_wnm_scan_done(struct wpa_supplicant *wpa_s)
 
 static void scan_done_cleanup(struct wpa_supplicant *wpa_s)
 {
-	uint16_t number = 1;
-	wifi_ap_record_t ap_records;
-
 	wpa_s->scanning = 0;
 	wpa_s->scan_reason = 0;
 	/* clean scan list from net80211 */
-	esp_wifi_scan_get_ap_records(&number, &ap_records);
+	esp_wifi_clear_ap_list();
 }
 
 void esp_supplicant_handle_scan_done_evt(void)
diff --git a/examples/bluetooth/blufi/main/blufi_example_main.c b/examples/bluetooth/blufi/main/blufi_example_main.c
index 313e1f7005..c1de842bd4 100644
--- a/examples/bluetooth/blufi/main/blufi_example_main.c
+++ b/examples/bluetooth/blufi/main/blufi_example_main.c
@@ -210,6 +210,7 @@ static void wifi_event_handler(void* arg, esp_event_base_t event_base,
         wifi_ap_record_t *ap_list = (wifi_ap_record_t *)malloc(sizeof(wifi_ap_record_t) * apCount);
         if (!ap_list) {
             BLUFI_ERROR("malloc error, ap_list is NULL");
+            esp_wifi_clear_ap_list();
             break;
         }
         ESP_ERROR_CHECK(esp_wifi_scan_get_ap_records(&apCount, ap_list));
diff --git a/examples/wifi/ftm/main/ftm_main.c b/examples/wifi/ftm/main/ftm_main.c
index 637c31349a..5a669cff1c 100644
--- a/examples/wifi/ftm/main/ftm_main.c
+++ b/examples/wifi/ftm/main/ftm_main.c
@@ -300,6 +300,7 @@ static bool wifi_perform_scan(const char *ssid, bool internal)
     g_ap_list_buffer = malloc(g_scan_ap_num * sizeof(wifi_ap_record_t));
     if (g_ap_list_buffer == NULL) {
         ESP_LOGE(TAG_STA, "Failed to malloc buffer to print scan results");
+        esp_wifi_clear_ap_list();
         return false;
     }
 
diff --git a/examples/wifi/iperf/main/cmd_wifi.c b/examples/wifi/iperf/main/cmd_wifi.c
index d6443973d4..ccc2f10699 100644
--- a/examples/wifi/iperf/main/cmd_wifi.c
+++ b/examples/wifi/iperf/main/cmd_wifi.c
@@ -75,6 +75,7 @@ static void scan_done_handler(void *arg, esp_event_base_t event_base,
     ap_list_buffer = malloc(sta_number * sizeof(wifi_ap_record_t));
     if (ap_list_buffer == NULL) {
         ESP_LOGE(TAG, "Failed to malloc buffer to print scan results");
+        esp_wifi_clear_ap_list();
         return;
     }
 
diff --git a/examples/wifi/roaming/main/roaming_example.c b/examples/wifi/roaming/main/roaming_example.c
index 2c1ec29bae..b41c5d3da0 100644
--- a/examples/wifi/roaming/main/roaming_example.c
+++ b/examples/wifi/roaming/main/roaming_example.c
@@ -304,9 +304,7 @@ void neighbor_report_recv_cb(void *ctx, const uint8_t *report, size_t report_len
 			goto cleanup;
 		}
 		/* cleanup from net802.11 */
-		uint16_t number = 1;
-		wifi_ap_record_t ap_records;
-		esp_wifi_scan_get_ap_records(&number, &ap_records);
+		esp_wifi_clear_ap_list();
 		cand_list = 1;
 	}
 	/* send AP btm query, this will cause STA to roam as well */