diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2010-03-22 15:56:59 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2010-03-22 15:56:59 -0700 |
| commit | 7f1cade2dc020d523af5047ea19db6db29878f18 (patch) | |
| tree | ea23fa22cb4bdbf2474f3e63dee6693fd3611571 | |
| parent | 645368feee7f6caf63b250c5ef925fd3c153b90b (diff) | |
| download | wlan-7f1cade2dc020d523af5047ea19db6db29878f18.tar.gz | |
wl1271: Fix scanCncn_MlmeResultCB() crash if pSsid is NULL
Change-Id: Iea56039cbbd629a91139e133cf64bc65dfa82bd9
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| -rw-r--r-- | wl1271/stad/src/Sta_Management/ScanCncn.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/wl1271/stad/src/Sta_Management/ScanCncn.c b/wl1271/stad/src/Sta_Management/ScanCncn.c index 4b3d273b..ff8910c2 100644 --- a/wl1271/stad/src/Sta_Management/ScanCncn.c +++ b/wl1271/stad/src/Sta_Management/ScanCncn.c @@ -730,7 +730,8 @@ void scanCncn_MlmeResultCB (TI_HANDLE hScanCncn, TMacAddr* bssid, mlmeFrameInfo_ TRACE6(pScanCncn->hReport, REPORT_SEVERITY_INFORMATION , "scanCncn_MlmeResultCB: received frame from BBSID: %02x:%02x:%02x:%02x:%02x:%02x\n", (*bssid)[ 0 ], (*bssid)[ 1 ], (*bssid)[ 2 ], (*bssid)[ 3 ], (*bssid)[ 4 ], (*bssid)[ 5 ]); /* If SSID length is 0 (hidden SSID), discard the frame */ - if (frameInfo->content.iePacket.pSsid->hdr[1] == 0) + if ((frameInfo->content.iePacket.pSsid == NULL) || + (frameInfo->content.iePacket.pSsid->hdr[1] == 0)) { /*Unless it is application scan for any SSID - In this case we want to see also the hidden SSIDs*/ if (!(((SCAN_SCC_APP_ONE_SHOT == eClient) || (SCAN_SCC_APP_PERIODIC == eClient)) && |