jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

test: Use more consistent NULL checking for associate ssid parameter

Browse source 
This was checked once against NULL, but not on the following uses.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-03-02 13:41:05 +02:00
parent bd27b1360f
commit d12eb581f9
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/drivers/driver_test.c
View file

@ -1529,7 +1529,8 @@ static int wpa_driver_test_associate(
#endif /* DRIVER_TEST_UNIX */ #endif /* DRIVER_TEST_UNIX */
if (params->mode == IEEE80211_MODE_AP) { if (params->mode == IEEE80211_MODE_AP) {
os_memcpy(dbss->ssid, params->ssid, params->ssid_len); if (params->ssid)
os_memcpy(dbss->ssid, params->ssid, params->ssid_len);
dbss->ssid_len = params->ssid_len; dbss->ssid_len = params->ssid_len;
os_memcpy(dbss->bssid, drv->own_addr, ETH_ALEN); os_memcpy(dbss->bssid, drv->own_addr, ETH_ALEN);
if (params->wpa_ie && params->wpa_ie_len) { if (params->wpa_ie && params->wpa_ie_len) {
@ -1550,8 +1551,9 @@ static int wpa_driver_test_associate(
MAC2STR(drv->own_addr)); MAC2STR(drv->own_addr));
if (ret >= 0 && ret < end - pos) if (ret >= 0 && ret < end - pos)
pos += ret; pos += ret;
pos += wpa_snprintf_hex(pos, end - pos, params->ssid, if (params->ssid)
params->ssid_len); pos += wpa_snprintf_hex(pos, end - pos, params->ssid,
params->ssid_len);
ret = os_snprintf(pos, end - pos, " "); ret = os_snprintf(pos, end - pos, " ");
if (ret >= 0 && ret < end - pos) if (ret >= 0 && ret < end - pos)
pos += ret; pos += ret;
@ -1575,12 +1577,15 @@ static int wpa_driver_test_associate(
return -1; return -1;
} }
os_memcpy(dbss->ssid, params->ssid, params->ssid_len); if (params->ssid)
os_memcpy(dbss->ssid, params->ssid, params->ssid_len);
dbss->ssid_len = params->ssid_len; dbss->ssid_len = params->ssid_len;
} else { } else {
drv->associated = 1; drv->associated = 1;
if (params->mode == IEEE80211_MODE_IBSS) { if (params->mode == IEEE80211_MODE_IBSS) {
os_memcpy(dbss->ssid, params->ssid, params->ssid_len); if (params->ssid)
os_memcpy(dbss->ssid, params->ssid,
params->ssid_len);
dbss->ssid_len = params->ssid_len; dbss->ssid_len = params->ssid_len;
if (params->bssid) if (params->bssid)
os_memcpy(dbss->bssid, params->bssid, os_memcpy(dbss->bssid, params->bssid,