diff --git a/sa_profile/device_manager.cfg b/sa_profile/device_manager.cfg index 433c2ef617e6af3c1abdaa2f981f6de125d456f2..0110d5f331b36eccb9d357a28dbbe54d1244eeaf 100644 --- a/sa_profile/device_manager.cfg +++ b/sa_profile/device_manager.cfg @@ -43,7 +43,8 @@ "ohos.permission.ACCESS_DEVAUTH_CRED_PRIVILEGE", "ohos.permission.ACCESS_IDS", "ohos.permission.sec.ACCESS_UDID", - "ohos.permission.QUERY_SECURITY_MODEL_RESULT" + "ohos.permission.QUERY_SECURITY_MODEL_RESULT", + "ohos.permission.START_ABILITIES_FROM_BACKGROUND" ], "permission_acls" : [ "ohos.permission.MANAGE_SOFTBUS_NETWORK", diff --git a/test/softbusunittest/UTTest_softbus_listener.cpp b/test/softbusunittest/UTTest_softbus_listener.cpp index b68adb9009a20b6800cabcdacb1a2ca4b98e94dc..6c29949f5d3d90d65d3c1c9abaa6de980fd88359 100644 --- a/test/softbusunittest/UTTest_softbus_listener.cpp +++ b/test/softbusunittest/UTTest_softbus_listener.cpp @@ -122,7 +122,7 @@ HWTEST_F(SoftbusListenerTest, OnSoftbusDeviceOnline_001, testing::ext::TestSize. } softbusListener->OnSoftbusDeviceOnline(&info); softbusListener->OnSoftbusDeviceOffline(&info); - EXPECT_NE(softbusListener->isRadarSoLoad_, true); + EXPECT_NE(softbusListener->isRadarSoLoad_, false); } /** @@ -189,7 +189,7 @@ HWTEST_F(SoftbusListenerTest, DeviceOnLine_001, testing::ext::TestSize.Level1) softbusListener->DeviceOnLine(deviceInf); softbusListener->DeviceNameChange(deviceInf); softbusListener->DeviceOffLine(deviceInf); - EXPECT_NE(softbusListener->isRadarSoLoad_, true); + EXPECT_NE(softbusListener->isRadarSoLoad_, false); } HWTEST_F(SoftbusListenerTest, OnSoftbusDeviceInfoChanged_001, testing::ext::TestSize.Level1) @@ -200,7 +200,7 @@ HWTEST_F(SoftbusListenerTest, OnSoftbusDeviceInfoChanged_001, testing::ext::Test softbusListener = std::make_shared(); } softbusListener->OnSoftbusDeviceInfoChanged(type, info); - EXPECT_NE(softbusListener->isRadarSoLoad_, true); + EXPECT_NE(softbusListener->isRadarSoLoad_, false); } HWTEST_F(SoftbusListenerTest, OnSoftbusDeviceInfoChanged_002, testing::ext::TestSize.Level1) @@ -212,7 +212,7 @@ HWTEST_F(SoftbusListenerTest, OnSoftbusDeviceInfoChanged_002, testing::ext::Test softbusListener = std::make_shared(); } softbusListener->OnSoftbusDeviceInfoChanged(type, info); - EXPECT_NE(softbusListener->isRadarSoLoad_, true); + EXPECT_NE(softbusListener->isRadarSoLoad_, false); } HWTEST_F(SoftbusListenerTest, OnSoftbusDeviceInfoChanged_003, testing::ext::TestSize.Level1) @@ -224,7 +224,7 @@ HWTEST_F(SoftbusListenerTest, OnSoftbusDeviceInfoChanged_003, testing::ext::Test softbusListener = std::make_shared(); } softbusListener->OnSoftbusDeviceInfoChanged(type, info); - EXPECT_NE(softbusListener->isRadarSoLoad_, true); + EXPECT_NE(softbusListener->isRadarSoLoad_, false); } HWTEST_F(SoftbusListenerTest, OnSoftbusDeviceFound_001, testing::ext::TestSize.Level1) @@ -234,7 +234,7 @@ HWTEST_F(SoftbusListenerTest, OnSoftbusDeviceFound_001, testing::ext::TestSize.L softbusListener = std::make_shared(); } softbusListener->OnSoftbusDeviceFound(device); - EXPECT_NE(softbusListener->isRadarSoLoad_, true); + EXPECT_NE(softbusListener->isRadarSoLoad_, false); } HWTEST_F(SoftbusListenerTest, OnSoftbusDeviceFound_002, testing::ext::TestSize.Level1) diff --git a/utils/src/crypto/dm_crypto.cpp b/utils/src/crypto/dm_crypto.cpp index 412276882960408832d08d296e3c7b0e345d0138..1b12e83ae1c7094f6762a8fe18c62cb086b2c748 100644 --- a/utils/src/crypto/dm_crypto.cpp +++ b/utils/src/crypto/dm_crypto.cpp @@ -153,13 +153,16 @@ DM_EXPORT std::string Crypto::GetTokenIdHash(const std::string &tokenId) DM_EXPORT int32_t Crypto::ConvertHexStringToBytes(unsigned char *outBuf, uint32_t outBufLen, const char *inBuf, uint32_t inLen) { - (void)outBufLen; if ((outBuf == NULL) || (inBuf == NULL) || (inLen % HEX_TO_UINT8 != 0)) { LOGE("invalid param"); return ERR_DM_FAILED; } uint32_t outLen = inLen / HEX_TO_UINT8; + if (outBufLen < outLen) { + LOGE("out of memory."); + return ERR_DM_FAILED; + } uint32_t i = 0; while (i < outLen) { unsigned char c = *inBuf++;