espressif/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-04-27 19:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/eloop_mem_leak_v5.5' into 'release/v5.5'

Browse Source 
fix(esp_wifi): Fix memory leak caused due to eloop (v5.5)

See merge request espressif/esp-idf!45903
This commit is contained in:
Jiang Jiang Jian
2026-03-06 23:33:40 +08:00
parent a5c11c5b4a 96b1b3bb59
commit b37eac1208
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/wpa_supplicant/esp_supplicant/src/esp_dpp.c
+4 -1
View File
@@ -772,7 +772,10 @@ static int esp_supp_rx_action(uint8_t *hdr, uint8_t *payload, size_t len, uint8_
rx_param->frm_len = len;
os_memcpy(rx_param->action_frm, payload, len);
eloop_register_timeout(0, 0, esp_dpp_rx_action, rx_param, NULL);
if (eloop_register_timeout(0, 0, esp_dpp_rx_action, rx_param, NULL) != 0) {
os_free(rx_param);
return ESP_ERR_NO_MEM;
}
}
return ret;
components/wpa_supplicant/esp_supplicant/src/esp_hostap.c
+4 -1
View File
@@ -507,7 +507,10 @@ bool wpa_ap_remove(u8* bssid)
return false;
}
os_memcpy(addr, sta->addr, ETH_ALEN);
eloop_register_timeout(0, 10000, ap_free_sta_timeout, hapd, addr);
if (eloop_register_timeout(0, 10000, ap_free_sta_timeout, hapd, addr) != 0) {
os_free(addr);
return false;
}
} else
#endif
ap_free_sta(hapd, sta);
components/wpa_supplicant/port/eloop.c
+4 -1
View File
@@ -169,7 +169,7 @@ overflow:
"ELOOP: Too long timeout (secs=%u usecs=%u) to ever happen - ignore it",
secs, usecs);
os_free(timeout);
return 0;
return -1;
}
#ifdef ELOOP_DEBUG
@@ -526,6 +526,9 @@ void eloop_destroy(void)
sec, usec, timeout->eloop_data, timeout->user_data,
timeout->handler);
#endif
if (timeout->handler) {
timeout->handler(timeout->eloop_data, timeout->user_data);
}
eloop_remove_timeout(timeout);
}
if (eloop_data_lock) {