summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiří Klimeš <jklimes@redhat.com>2015-10-22 10:17:20 +0200
committerJiří Klimeš <jklimes@redhat.com>2015-10-22 10:34:13 +0200
commite0e043ef3918de54f8d19a3af07d3367962970e5 (patch)
tree57e231628ecaef35a92d8500582abea8540ba40e
parentf85ccf9a9e6fe2cbb94e68bde7fb02aa68441d40 (diff)
wifi: do no crash when getting BSSID fails
https://bodhi.fedoraproject.org/updates/NetworkManager-1.0.6-7.fc23#comment-342089 (cherry picked from commit e9bc18d2a7befb032052555ffba22bc72c9b8c2f)
-rw-r--r--src/devices/wifi/nm-device-wifi.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index a30b8ef04d..57d0a9d293 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -1649,7 +1649,11 @@ try_fill_ssid_for_hidden_ap (NMAccessPoint *ap)
g_return_if_fail (nm_ap_get_ssid (ap) == NULL);
bssid = nm_ap_get_address (ap);
- g_assert (bssid);
+ if (!bssid) {
+ nm_log_dbg (LOGD_WIFI, "failed to get BSSID for hidden AP %s",
+ str_if_set (nm_ap_get_supplicant_path (ap), "(none)"));
+ return;
+ }
/* Look for this AP's BSSID in the seen-bssids list of a connection,
* and if a match is found, copy over the SSID */