Merge pull request #8201 from dhalbert/8.2.x-backport-8150-set-hostname

tannewt · web-flow · commit f902e0d86b6d · 2023-07-24T09:48:33.000-07:00
8.2.x backport: fix set hostname
diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -88,7 +88,7 @@ mp_obj_t common_hal_wifi_radio_get_hostname(wifi_radio_obj_t *self) {
 
 void common_hal_wifi_radio_set_hostname(wifi_radio_obj_t *self, const char *hostname) {
     assert(strlen(hostname) < MP_ARRAY_SIZE(self->hostname));
-    memcpy(self->hostname, hostname, strlen(hostname));
+    strncpy(self->hostname, hostname, MP_ARRAY_SIZE(self->hostname) - 1);
     netif_set_hostname(NETIF_STA, self->hostname);
     netif_set_hostname(NETIF_AP, self->hostname);
 }

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ mp_obj_t common_hal_wifi_radio_get_hostname(wifi_radio_obj_t *self) {`
`88`	`88`
`89`	`89`	`void common_hal_wifi_radio_set_hostname(wifi_radio_obj_t self, const char hostname) {`
`90`	`90`	`assert(strlen(hostname) < MP_ARRAY_SIZE(self->hostname));`
`91`		`- memcpy(self->hostname, hostname, strlen(hostname));`
	`91`	`+ strncpy(self->hostname, hostname, MP_ARRAY_SIZE(self->hostname) - 1);`
`92`	`92`	`netif_set_hostname(NETIF_STA, self->hostname);`
`93`	`93`	`netif_set_hostname(NETIF_AP, self->hostname);`
`94`	`94`	`}`