From 5b5fb02b225c5c05a4477bef58bdaceede5d68dc Mon Sep 17 00:00:00 2001 From: andy2_kuo Date: Tue, 22 May 2012 11:53:07 -0700 Subject: Fix null pointer access for SSID printing. Bug [Issue 6517978] Change-Id: Ife823dce3b8b50c0c3eb0d5a2d8ecf2c8e4ac17e --- wpa_supplicant/ctrl_iface.c | 3 ++- 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 f81f6f21..5d8409c3 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 9376c7a2..f613897d 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 */ } -- cgit v1.2.3