Mirrors_Framework/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-05-23 03:06:05 +08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

[wifi] Fix crash during WiFi reconnection on ESP32 with poor signal quality (#9989)
CI / Create common environment (push) Has been cancelled
Details
CI / Check pylint (push) Has been cancelled
Details
CI / Run script/ci-custom (push) Has been cancelled
Details
CI / Run pytest (macOS-latest, 3.11) (push) Has been cancelled
Details
CI / Run pytest (ubuntu-latest, 3.11) (push) Has been cancelled
Details
CI / Run pytest (ubuntu-latest, 3.12) (push) Has been cancelled
Details
CI / Run pytest (ubuntu-latest, 3.13) (push) Has been cancelled
Details
CI / Run pytest (windows-latest, 3.11) (push) Has been cancelled
Details
CI / Determine which jobs to run (push) Has been cancelled
Details
CI / Run integration tests (push) Has been cancelled
Details
CI / Run script/clang-tidy for ESP32 Arduino 1/4 (push) Has been cancelled
Details
CI / Run script/clang-tidy for ESP32 Arduino 2/4 (push) Has been cancelled
Details
CI / Run script/clang-tidy for ESP32 Arduino 3/4 (push) Has been cancelled
Details
CI / Run script/clang-tidy for ESP32 Arduino 4/4 (push) Has been cancelled
Details
CI / Run script/clang-tidy for ESP32 IDF (push) Has been cancelled
Details
CI / Run script/clang-tidy for ESP8266 (push) Has been cancelled
Details
CI / Run script/clang-tidy for ZEPHYR (push) Has been cancelled
Details
CI / Component test ${{ matrix.file }} (push) Has been cancelled
Details
CI / Split components for testing into 20 groups maximum (push) Has been cancelled
Details
CI / Test split components (push) Has been cancelled
Details
CI / pre-commit.ci lite (push) Has been cancelled
Details
CI / CI Status (push) Has been cancelled
Details

Browse Source
This commit is contained in:
J. Nick Koston
2025-07-31 21:46:52 -10:00
committed by GitHub
parent 940a8b43fa
commit 20ad1ab4eb
2 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/wifi/wifi_component_esp32_arduino.cpp
+18
View File
@@ -283,6 +283,12 @@ bool WiFiComponent::wifi_sta_ip_config_(optional<ManualIP> manual_ip) {
if (!this->wifi_mode_(true, {}))
return false;
// Check if the STA interface is initialized before using it
if (s_sta_netif == nullptr) {
ESP_LOGW(TAG, "STA interface not initialized");
return false;
}
esp_netif_dhcp_status_t dhcp_status;
esp_err_t err = esp_netif_dhcpc_get_status(s_sta_netif, &dhcp_status);
if (err != ESP_OK) {
@@ -541,6 +547,8 @@ void WiFiComponent::wifi_event_callback_(esphome_wifi_event_id_t event, esphome_
}
case ESPHOME_EVENT_ID_WIFI_STA_STOP: {
ESP_LOGV(TAG, "STA stop");
// Clear the STA interface handle to prevent use-after-free
s_sta_netif = nullptr;
break;
}
case ESPHOME_EVENT_ID_WIFI_STA_CONNECTED: {
@@ -630,6 +638,10 @@ void WiFiComponent::wifi_event_callback_(esphome_wifi_event_id_t event, esphome_
}
case ESPHOME_EVENT_ID_WIFI_AP_STOP: {
ESP_LOGV(TAG, "AP stop");
#ifdef USE_WIFI_AP
// Clear the AP interface handle to prevent use-after-free
s_ap_netif = nullptr;
#endif
break;
}
case ESPHOME_EVENT_ID_WIFI_AP_STACONNECTED: {
@@ -719,6 +731,12 @@ bool WiFiComponent::wifi_ap_ip_config_(optional<ManualIP> manual_ip) {
if (!this->wifi_mode_({}, true))
return false;
// Check if the AP interface is initialized before using it
if (s_ap_netif == nullptr) {
ESP_LOGW(TAG, "AP interface not initialized");
return false;
}
esp_netif_ip_info_t info;
if (manual_ip.has_value()) {
info.ip = manual_ip->static_ip;
esphome/components/wifi/wifi_component_esp_idf.cpp
+18
View File
@@ -473,6 +473,12 @@ bool WiFiComponent::wifi_sta_ip_config_(optional<ManualIP> manual_ip) {
if (!this->wifi_mode_(true, {}))
return false;
// Check if the STA interface is initialized before using it
if (s_sta_netif == nullptr) {
ESP_LOGW(TAG, "STA interface not initialized");
return false;
}
esp_netif_dhcp_status_t dhcp_status;
esp_err_t err = esp_netif_dhcpc_get_status(s_sta_netif, &dhcp_status);
if (err != ESP_OK) {
@@ -691,6 +697,8 @@ void WiFiComponent::wifi_process_event_(IDFWiFiEvent *data) {
} else if (data->event_base == WIFI_EVENT && data->event_id == WIFI_EVENT_STA_STOP) {
ESP_LOGV(TAG, "STA stop");
s_sta_started = false;
// Clear the STA interface handle to prevent use-after-free
s_sta_netif = nullptr;
} else if (data->event_base == WIFI_EVENT && data->event_id == WIFI_EVENT_STA_AUTHMODE_CHANGE) {
const auto &it = data->data.sta_authmode_change;
@@ -789,6 +797,10 @@ void WiFiComponent::wifi_process_event_(IDFWiFiEvent *data) {
} else if (data->event_base == WIFI_EVENT && data->event_id == WIFI_EVENT_AP_STOP) {
ESP_LOGV(TAG, "AP stop");
s_ap_started = false;
#ifdef USE_WIFI_AP
// Clear the AP interface handle to prevent use-after-free
s_ap_netif = nullptr;
#endif
} else if (data->event_base == WIFI_EVENT && data->event_id == WIFI_EVENT_AP_PROBEREQRECVED) {
const auto &it = data->data.ap_probe_req_rx;
@@ -865,6 +877,12 @@ bool WiFiComponent::wifi_ap_ip_config_(optional<ManualIP> manual_ip) {
if (!this->wifi_mode_({}, true))
return false;
// Check if the AP interface is initialized before using it
if (s_ap_netif == nullptr) {
ESP_LOGW(TAG, "AP interface not initialized");
return false;
}
esp_netif_ip_info_t info;
if (manual_ip.has_value()) {
info.ip = manual_ip->static_ip;