github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-14 00:28:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wifi] Fix CYW43 scan SSID not null-terminated

Browse Source 
The cyw43_ev_scan_result_t ssid field is a 32-byte buffer that is
not guaranteed to be null-terminated. Use ssid_len to properly
terminate the string before passing it to string comparison functions.

This fixes false "should be marked hidden" warnings where the SSID
match failed due to garbage bytes after the actual SSID in the buffer.
This commit is contained in:
J. Nick Koston
2026-02-26 11:23:41 -10:00
parent ec132fb081
commit 7ad44c68f7
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/wifi/wifi_component_pico_w.cpp
+11 -5
View File
@@ -147,18 +147,24 @@ int WiFiComponent::s_wifi_scan_result(void *env, const cyw43_ev_scan_result_t *r
void WiFiComponent::wifi_scan_result(void *env, const cyw43_ev_scan_result_t *result) {
s_scan_result_count++;
const char *ssid_cstr = reinterpret_cast<const char *>(result->ssid);
// CYW43 scan results have ssid as a 32-byte buffer that is NOT null-terminated.
// Use ssid_len to create a properly terminated copy for string operations.
uint8_t len = std::min(result->ssid_len, static_cast<uint8_t>(sizeof(result->ssid)));
char ssid_buf[33]; // 32 max + null terminator
memcpy(ssid_buf, result->ssid, len);
ssid_buf[len] = '\0';
// Skip networks that don't match any configured network (unless full results needed)
if (!this->needs_full_scan_results_() && !this->matches_configured_network_(ssid_cstr, result->bssid)) {
this->log_discarded_scan_result_(ssid_cstr, result->bssid, result->rssi, result->channel);
if (!this->needs_full_scan_results_() && !this->matches_configured_network_(ssid_buf, result->bssid)) {
this->log_discarded_scan_result_(ssid_buf, result->bssid, result->rssi, result->channel);
return;
}
bssid_t bssid;
std::copy(result->bssid, result->bssid + 6, bssid.begin());
WiFiScanResult res(bssid, ssid_cstr, strlen(ssid_cstr), result->channel, result->rssi,
result->auth_mode != CYW43_AUTH_OPEN, ssid_cstr[0] == '\0');
WiFiScanResult res(bssid, ssid_buf, len, result->channel, result->rssi, result->auth_mode != CYW43_AUTH_OPEN,
len == 0);
if (std::find(this->scan_result_.begin(), this->scan_result_.end(), res) == this->scan_result_.end()) {
this->scan_result_.push_back(res);
}