diff options
| author | andy2_kuo <andy2_kuo@asus.com> | 2012-05-22 11:53:07 -0700 |
|---|---|---|
| committer | Ramanan Rajeswaran <ramanan@google.com> | 2012-05-29 09:09:02 -0700 |
| commit | 5b5fb02b225c5c05a4477bef58bdaceede5d68dc (patch) | |
| tree | 89bdce77f7ecc2b298f0eb9e724a181e5704f7cc /wpa_supplicant | |
| parent | c81d5b6205bf762093632de2cd7125de3d10eed5 (diff) | |
| download | external_wpa_supplicant_8-5b5fb02b225c5c05a4477bef58bdaceede5d68dc.zip external_wpa_supplicant_8-5b5fb02b225c5c05a4477bef58bdaceede5d68dc.tar.gz external_wpa_supplicant_8-5b5fb02b225c5c05a4477bef58bdaceede5d68dc.tar.bz2 | |
Fix null pointer access for SSID printing.
Bug [Issue 6517978]
Change-Id: Ife823dce3b8b50c0c3eb0d5a2d8ecf2c8e4ac17e
Diffstat (limited to 'wpa_supplicant')
| -rw-r--r-- | wpa_supplicant/ctrl_iface.c | 3 | ||||
| -rw-r--r-- | wpa_supplicant/notify.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index f81f6f2..5d8409c 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -1015,7 +1015,8 @@ static int wpa_supplicant_ctrl_iface_status(struct wpa_supplicant *wpa_s, wpa_s->current_ssid ? wpa_s->current_ssid->id : -1, wpa_s->wpa_state, MAC2STR(wpa_s->pending_bssid), - wpa_s->current_ssid ? wpa_ssid_txt(wpa_s->current_ssid->ssid, + wpa_s->current_ssid && wpa_s->current_ssid->ssid ? + wpa_ssid_txt(wpa_s->current_ssid->ssid, wpa_s->current_ssid->ssid_len) : ""); if (wpa_s->wpa_state == WPA_COMPLETED) { struct wpa_ssid *ssid = wpa_s->current_ssid; diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c index 9376c7a..f613897 100644 --- a/wpa_supplicant/notify.c +++ b/wpa_supplicant/notify.c @@ -94,7 +94,8 @@ void wpas_notify_state_changed(struct wpa_supplicant *wpa_s, wpa_s->current_ssid ? wpa_s->current_ssid->id : -1, new_state, MAC2STR(wpa_s->pending_bssid), - wpa_s->current_ssid ? wpa_ssid_txt(wpa_s->current_ssid->ssid, + wpa_s->current_ssid && wpa_s->current_ssid->ssid ? + wpa_ssid_txt(wpa_s->current_ssid->ssid, wpa_s->current_ssid->ssid_len): ""); #endif /* ANDROID */ } |