From 7832adbbd72a1b784b7fb74a71a5d4085b0cb0d3 Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Tue, 29 Apr 2014 10:53:02 -0700 Subject: Cumulative patch from commit c0333c8dd59b9e254d3fc725c984b1c0cd3d496a c0333c8 Check rx_mgmt::frame more consistently against NULL d6c6b1f Make sta NULL-check easier for static analyzers 0bceb8d Make dl_list_first() and dl_list_last() uses easier for static analyzers 5f693cb WPS HTTP: Remove unused assignment ee4fefc Remove duplicated variable zeroing 4a9d0eb Make PMKID check easier for static analyzers 06df2aa Remove floating constant suffix 'd' from test coee 9670f87 ACS: Clean up ifdef CONFIG_ACS to avoid unreachable code ece88f7 Make last_scan_res update easier for static analyzers d06e9ac P2P: Verify operating channel validity for NFC connection handover 13a524a nl80211: Remove unnecessary wpa_driver_nl80211_set_freq() wrapper e87ef75 nl80211: Add support for changing AP mode channel bandwidth 3057518 Sync with mac80211-next.git nl80211.h 5f0bca7 Retry initial 20/40 MHz co-ex scan if the driver is busy 587d60d Add AP mode support for HT 20/40 co-ex Action frame 9c47f6a hostapd: Extend support for HT 20/40 coexistence feature 196c9c7 Make channel parameters available in set_ap() driver operation b7a6702 Indicate disconnection event on interface disabled b89962b Fix wpa_config_read() with existing config block 27b4187 WPS: Print setsockopt() failure in debug log 52cb207 trace: Replace demangle.h with internal defines 0e80ea2 nl80211: Fix some coding style issues a26582c Make qca-vendor.h independent of other header files 4a64d5a nl80211: Allocate QCA vendor subcmd for extended statistics Change-Id: Ibabee77b2b87f04f99d6b1ca0f1ac741cb9222c0 Signed-off-by: Dmitry Shmidt --- wpa_supplicant/bss.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'wpa_supplicant/bss.c') diff --git a/wpa_supplicant/bss.c b/wpa_supplicant/bss.c index 482fc64f..f99a8a71 100644 --- a/wpa_supplicant/bss.c +++ b/wpa_supplicant/bss.c @@ -674,7 +674,8 @@ void wpa_bss_update_scan_res(struct wpa_supplicant *wpa_s, wpa_s->last_scan_res_size = siz; } - wpa_s->last_scan_res[wpa_s->last_scan_res_used++] = bss; + if (wpa_s->last_scan_res) + wpa_s->last_scan_res[wpa_s->last_scan_res_used++] = bss; } -- cgit v1.2.3