summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2010-06-15 10:57:28 -0700
committerDan Williams <dcbw@redhat.com>2010-06-15 10:59:09 -0700
commit2ce88d21315c5dbfe703b70181bbd09ea64a80ab (patch)
tree3d91f0274f5b641d71f45e8a0ef80a066d855dd9
parent82e6c3ba67b9f3b5d18ba4adaf01eb8a315db0ba (diff)
downloadnetwork-manager-applet-2ce88d21315c5dbfe703b70181bbd09ea64a80ab.tar.gz
utils: don't crash if AP BSSID isn't available (rh #603236)
Due to D-Bus issues, it may not be since it's retrieved on-the-fly from NM. If for some reason it wasn't available, don't crash.
-rw-r--r--src/utils/utils.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/utils/utils.c b/src/utils/utils.c
index f75cd065..9362fd23 100644
--- a/src/utils/utils.c
+++ b/src/utils/utils.c
@@ -550,8 +550,10 @@ utils_check_ap_compatible (NMAccessPoint *ap,
setting_bssid = nm_setting_wireless_get_bssid (s_wireless);
if (setting_bssid) {
struct ether_addr ap_addr;
+ const char *hw_addr;
- if (ether_aton_r (nm_access_point_get_hw_address (ap), &ap_addr)) {
+ hw_addr = nm_access_point_get_hw_address (ap);
+ if (hw_addr && ether_aton_r (hw_addr, &ap_addr)) {
if (memcmp (setting_bssid->data, &ap_addr, ETH_ALEN))
return FALSE;
}