mirrors
/
pimoroni-pico
mirror of https://github.com/pimoroni/pimoroni-pico.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PicoWireless: use strnlen for fwver and SSIDs 

Avoid going through std::string and instead uses strnlen to get string length.

Prevents extra null chars leaking into the Python string.
This commit is contained in:
Phil Howard 2021-10-04 16:16:19 +01:00
parent 7772959450
commit 71058bca1e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
micropython/modules/pico_wireless/pico_wireless.cpp
View File

@ -370,8 +370,7 @@ mp_obj_t picowireless_get_ssid_networks(size_t n_args, const mp_obj_t *pos_args,
uint8_t network_item = args[ARG_network_item].u_int;
const char* ssid = wireless->get_ssid_networks(network_item);
if(ssid != nullptr) {
std::string str_ssid(ssid, WL_SSID_MAX_LENGTH);
return mp_obj_new_str(str_ssid.c_str(), str_ssid.length());
return mp_obj_new_str(ssid, strnlen(ssid, WL_SSID_MAX_LENGTH));
}
}
else
@ -516,8 +515,7 @@ mp_obj_t picowireless_get_host_by_name(size_t n_args, const mp_obj_t *pos_args,
mp_obj_t picowireless_get_fw_version() {
if(wireless != nullptr) {
const char* fw_ver = wireless->get_fw_version();
std::string str_fw_ver(fw_ver, WL_FW_VER_LENGTH);
return mp_obj_new_str(str_fw_ver.c_str(), str_fw_ver.length());
return mp_obj_new_str(fw_ver, strnlen(fw_ver, WL_FW_VER_LENGTH));
}
else
mp_raise_msg(&mp_type_RuntimeError, NOT_INITIALISED_MSG);