diff options
| author | andy2_kuo <andy2_kuo@asus.com> | 2012-05-22 11:53:07 -0700 |
|---|---|---|
| committer | Arik Nemtsov <arik@wizery.com> | 2012-08-02 13:04:01 +0300 |
| commit | 239afb41844eb00d1903b147857e17b32502aea2 (patch) | |
| tree | cd8c1b9fc2b1368e3cb719858c0e6a3b9a0b7c39 | |
| parent | 7f7c24411a2928fcde585f2b135b07aff37ec717 (diff) | |
| download | external_wpa_supplicant_8_ti-239afb41844eb00d1903b147857e17b32502aea2.zip external_wpa_supplicant_8_ti-239afb41844eb00d1903b147857e17b32502aea2.tar.gz external_wpa_supplicant_8_ti-239afb41844eb00d1903b147857e17b32502aea2.tar.bz2 | |
Fix null pointer access for SSID printing.
| -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 351dde6..76eb424 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -1157,7 +1157,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 8a151ec..59e6975 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 */ } |