From: Jouni Malinen Date: Sat, 23 Feb 2019 09:37:20 +0000 (+0200) Subject: Multi-AP: Avoid memcpy(ptr, NULL, 0) in WPS Registrar initialization X-Git-Tag: hostap_2_8~335 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1415d4b82d5eab4c8edf2c2b32200137ae0178c3;p=thirdparty%2Fhostap.git Multi-AP: Avoid memcpy(ptr, NULL, 0) in WPS Registrar initialization 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 --- diff --git a/src/wps/wps_registrar.c b/src/wps/wps_registrar.c index 266965077..0ac5b2831 100644 --- a/src/wps/wps_registrar.c +++ b/src/wps/wps_registrar.c @@ -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,