From d566107c909df5beae0dd08eb2d1bdde97537939 Mon Sep 17 00:00:00 2001 From: Yingying Tang Date: Thu, 20 Oct 2016 17:53:01 +0800 Subject: [PATCH] qcacld-3.0: Fix incorrect NULL pointer check for SME Propagate from qcacld-2.0 to qcacld-3.0 Currently there are some places where array name is compared to NULL in SME. Add fix to correct it. CRs-Fixed: 1063255 Change-Id: Id37e8b6fc483d41c4e5b48bb78c295acc08a0328 --- core/sme/src/common/sme_ft_api.c | 2 +- core/sme/src/csr/csr_api_roam.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/sme/src/common/sme_ft_api.c b/core/sme/src/common/sme_ft_api.c index 0ab104f00ea5..e8c5aa87fc94 100644 --- a/core/sme/src/common/sme_ft_api.c +++ b/core/sme/src/common/sme_ft_api.c @@ -301,7 +301,7 @@ QDF_STATUS sme_ft_send_update_key_ind(tHalHandle hal, uint32_t session_id, keymaterial->key[0].paeRole = ftkey_info->paeRole; keymaterial->key[0].keyLength = ftkey_info->keyLength; - if (ftkey_info->keyLength && ftkey_info->Key) { + if (ftkey_info->keyLength) { qdf_mem_copy(&keymaterial->key[0].key, ftkey_info->Key, ftkey_info->keyLength); if (ftkey_info->keyLength == 16) { diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 68a879b7e53b..51633530ec6e 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -7432,7 +7432,7 @@ QDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, pDstProfile->BSSIDs.numOfBSSIDs = 1; qdf_copy_macaddr(pDstProfile->BSSIDs.bssid, &pSrcProfile->bssid); - if (pSrcProfile->SSID.ssId) { + if (pSrcProfile->SSID.length > 0) { pDstProfile->SSIDs.SSIDList = qdf_mem_malloc(sizeof(tCsrSSIDInfo)); if (NULL == pDstProfile->SSIDs.SSIDList) {