From: Jouni Malinen <j@w1.fi>
Date: Sat, 19 Nov 2011 15:01:53 +0000 (+0200)
Subject: Do not try to add wildcard SSID into active sched_scan
X-Git-Tag: aosp-jb-start~289
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f56f3a496a51efe9ee528098968549e14fe9184;p=thirdparty%2Fhostap.git

Do not try to add wildcard SSID into active sched_scan

Even though scan_ssid should not really be set for wildcard SSID,
better verify that here explicitly insead of assuming that the
SSID is set.

Signed-hostap: Jouni Malinen <j@w1.fi>
---

diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c
index d6d45ee9b..b902692c6 100644
--- a/wpa_supplicant/scan.c
+++ b/wpa_supplicant/scan.c
@@ -765,8 +765,9 @@ int wpa_supplicant_req_sched_scan(struct wpa_supplicant *wpa_s)
 			params.num_filter_ssids++;
 		}
 
-		if (ssid->scan_ssid) {
-			wpa_dbg(wpa_s, MSG_DEBUG, "add to active scan ssid: %s",
+		if (ssid->scan_ssid && ssid->ssid && ssid->ssid_len) {
+			wpa_dbg(wpa_s, MSG_DEBUG,
+				"add to active scan ssid: %s",
 				wpa_ssid_txt(ssid->ssid, ssid->ssid_len));
 			params.ssids[params.num_ssids].ssid =
 				ssid->ssid;