Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_ESP32: use correct unformatted system ID length 

Avoids stuffing uninitialized data into the ID.
This commit is contained in:
Thomas Watson 2024-07-13 11:49:47 -05:00 committed by Peter Barker
parent a3aa278589
commit 63ab7bec69
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_HAL_ESP32/Util.cpp
View File

@ -243,15 +243,13 @@ bool Util::get_system_id(char buf[50])
bool Util::get_system_id_unformatted(uint8_t buf[], uint8_t &len) bool Util::get_system_id_unformatted(uint8_t buf[], uint8_t &len)
{ {
len = MIN(12, len);
uint8_t base_mac_addr[6] = {0}; uint8_t base_mac_addr[6] = {0};
esp_err_t ret = esp_efuse_mac_get_custom(base_mac_addr); esp_err_t ret = esp_efuse_mac_get_custom(base_mac_addr);
if (ret != ESP_OK) { if (ret != ESP_OK) {
ret = esp_efuse_mac_get_default(base_mac_addr); ret = esp_efuse_mac_get_default(base_mac_addr);
} }
len = MIN(len, ARRAY_SIZE(base_mac_addr));
memcpy(buf, (const void *)base_mac_addr, len); memcpy(buf, (const void *)base_mac_addr, len);
return true; return true;