commit 5b5fb02b225c5c05a4477bef58bdaceede5d68dc
author andy2_kuo <andy2_kuo@asus.com> Tue May 22 11:53:07 2012 -0700
committer Ramanan Rajeswaran <ramanan@google.com> Tue May 29 09:09:02 2012 -0700
tree 89bdce77f7ecc2b298f0eb9e724a181e5704f7cc
parent c81d5b6205bf762093632de2cd7125de3d10eed5

Fix null pointer access for SSID printing.

Bug [Issue 6517978]

Change-Id: Ife823dce3b8b50c0c3eb0d5a2d8ecf2c8e4ac17e

wpa_supplicant/ctrl_iface.c

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 @@
 		     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;