openharmony/communication_dsoftbus
1
0
Fork 0
mirror of https://gitee.com/openharmony/communication_dsoftbus synced 2024-11-27 02:40:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!4009 fix: Clear the shared key before releasing it

Browse Source 
Merge pull request !4009 from manan/master
This commit is contained in:
openharmony_ci 2023-08-25 11:31:18 +00:00 committed by Gitee
commit 19abf06ce3
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
adapter/common/net/wifi/common/softbus_wifi_api_adapter.c
View File

@ -98,12 +98,16 @@ NO_SANITIZE("cfi") int32_t SoftBusGetWifiDeviceConfig(SoftBusWifiDevConf *config
retVal = GetDeviceConfigs(result, &wifiConfigSize);
if (retVal != SOFTBUS_OK) {
SoftBusLog(SOFTBUS_LOG_LNN, SOFTBUS_LOG_ERROR, "malloc wifi device config fail");
(void)memset_s(result, sizeof(WifiDeviceConfig) * WIFI_MAX_CONFIG_SIZE, 0,
sizeof(WifiDeviceConfig) * WIFI_MAX_CONFIG_SIZE);
SoftBusFree(result);
return SOFTBUS_ERR;
}
if (wifiConfigSize > WIFI_MAX_CONFIG_SIZE) {
SoftBusLog(SOFTBUS_LOG_LNN, SOFTBUS_LOG_ERROR, "wifi device config size is invalid.");
(void)memset_s(result, sizeof(WifiDeviceConfig) * WIFI_MAX_CONFIG_SIZE, 0,
sizeof(WifiDeviceConfig) * WIFI_MAX_CONFIG_SIZE);
SoftBusFree(result);
return SOFTBUS_ERR;
}
@ -111,6 +115,8 @@ NO_SANITIZE("cfi") int32_t SoftBusGetWifiDeviceConfig(SoftBusWifiDevConf *config
for (i = 0; i < wifiConfigSize; i++) {
if (ConvertSoftBusWifiConfFromWifiDev(result, configList) != SOFTBUS_OK) {
SoftBusLog(SOFTBUS_LOG_LNN, SOFTBUS_LOG_ERROR, "convert wifi config failed.");
(void)memset_s(result, sizeof(WifiDeviceConfig) * WIFI_MAX_CONFIG_SIZE, 0,
sizeof(WifiDeviceConfig) * WIFI_MAX_CONFIG_SIZE);
SoftBusFree(result);
return SOFTBUS_ERR;
}
@ -118,6 +124,8 @@ NO_SANITIZE("cfi") int32_t SoftBusGetWifiDeviceConfig(SoftBusWifiDevConf *config
configList++;
}
*num = wifiConfigSize;
(void)memset_s(result, sizeof(WifiDeviceConfig) * WIFI_MAX_CONFIG_SIZE, 0,
sizeof(WifiDeviceConfig) * WIFI_MAX_CONFIG_SIZE);
SoftBusFree(result);
return SOFTBUS_OK;
}