]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
Multi-AP: Avoid memcpy(ptr, NULL, 0) in WPS Registrar initialization
authorJouni Malinen <j@w1.fi>
Sat, 23 Feb 2019 09:37:20 +0000 (11:37 +0200)
committerJouni Malinen <j@w1.fi>
Sat, 23 Feb 2019 09:37:20 +0000 (11:37 +0200)
This can result in compiler warnings due to the unexpected NULL pointer
as a source memory even when the length of the copied data is 0.

Signed-off-by: Jouni Malinen <j@w1.fi>
src/wps/wps_registrar.c

index 2669650775111140f7e2b5e1be17ab0e260089a7..0ac5b2831379312e125f4e5be6f5b19f50388186 100644 (file)
@@ -698,9 +698,13 @@ wps_registrar_init(struct wps_context *wps,
        reg->dualband = cfg->dualband;
        reg->force_per_enrollee_psk = cfg->force_per_enrollee_psk;
 
-       os_memcpy(reg->multi_ap_backhaul_ssid, cfg->multi_ap_backhaul_ssid,
-                 cfg->multi_ap_backhaul_ssid_len);
-       reg->multi_ap_backhaul_ssid_len = cfg->multi_ap_backhaul_ssid_len;
+       if (cfg->multi_ap_backhaul_ssid) {
+               os_memcpy(reg->multi_ap_backhaul_ssid,
+                         cfg->multi_ap_backhaul_ssid,
+                         cfg->multi_ap_backhaul_ssid_len);
+               reg->multi_ap_backhaul_ssid_len =
+                       cfg->multi_ap_backhaul_ssid_len;
+       }
        if (cfg->multi_ap_backhaul_network_key) {
                reg->multi_ap_backhaul_network_key =
                        os_memdup(cfg->multi_ap_backhaul_network_key,