From 8f5ca35184f8c0b35c3a1625bf99707285c1860e Mon Sep 17 00:00:00 2001
From: libo429 <libo429@huawei.com>
Date: Wed, 27 Aug 2025 09:53:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=A1=E9=AA=8CConvertHexStringToBytes?=
 =?UTF-8?q?=E5=87=BA=E5=8F=82=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: libo429 <libo429@huawei.com>
---
 sa_profile/device_manager.cfg                    |  3 ++-
 test/softbusunittest/UTTest_softbus_listener.cpp | 12 ++++++------
 utils/src/crypto/dm_crypto.cpp                   |  5 ++++-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/sa_profile/device_manager.cfg b/sa_profile/device_manager.cfg
index 433c2ef61..0110d5f33 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 b68adb900..6c29949f5 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>();
     }
     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>();
     }
     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>();
     }
     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>();
     }
     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 412276882..1b12e83ae 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++;
-- 
Gitee