From edfeb463fba2e73e63d3f0ed211c6cada060d5d2 Mon Sep 17 00:00:00 2001
From: gitwuxd <wuxiaodan5@huawei.com>
Date: Wed, 25 May 2022 20:49:49 +0800
Subject: [PATCH] modify the code xts_dcts.sever

Signed-off-by: gitwuxd <wuxiaodan5@huawei.com>
---
 common/shm_utils.cpp                          | 11 ++++++++---
 .../disdata_func_test.cpp                     | 19 +++++++++----------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/common/shm_utils.cpp b/common/shm_utils.cpp
index 232511e..b5dc754 100644
--- a/common/shm_utils.cpp
+++ b/common/shm_utils.cpp
@@ -119,7 +119,7 @@ int waitDataWithCode(char* code, char* data)
 
 int writeCodeDataToShm(int code, char* buf)
 {
-    char str[1024] = { 0 };
+    char str[MAX_DATA_LENGTH] = { 0 };
     char codeStr[5] = { 0 };
     char* str2 = Int2String(code, codeStr);
     if (str2 == nullptr) {
@@ -128,11 +128,16 @@ int writeCodeDataToShm(int code, char* buf)
     if (strcpy_s(str, strlen(codeStr) + 1, codeStr) != EOK) {
         return -1;
     }
-    strcat(str, ":");
+    if (strcat_s(str, strlen(":") + 1, ":") != EOK) {
+        return -1;
+    }
+
     if (buf == nullptr) {
         return -1;
     }
-    strcat(str, buf);
+    if (strcat_s(str, strlen(buf) + 1, buf) != EOK) {
+        return -1;
+    }
     int nres = writeDataToShm(str);
     if (nres == -1) {
         return -1;
diff --git a/distributeddatamgr/cpptest/distributed_kv_store/disdata_func_test.cpp b/distributeddatamgr/cpptest/distributed_kv_store/disdata_func_test.cpp
index f41c1a1..9104948 100755
--- a/distributeddatamgr/cpptest/distributed_kv_store/disdata_func_test.cpp
+++ b/distributeddatamgr/cpptest/distributed_kv_store/disdata_func_test.cpp
@@ -98,8 +98,7 @@ void KvStoreSyncCallbackTestImpl::SyncCompleted(const std::map<std::string, Stat
 class Observer : public KvStoreObserver {
     void OnChange(const ChangeNotification& changeNotification);
 };
-void Observer::OnChange(
-    const ChangeNotification& changeNotification)
+void Observer::OnChange(const ChangeNotification& changeNotification)
 {
     LOG("%s OnChange begin", LOGSTR);
     cout << "OnChange insert: " << changeNotification.GetInsertEntries().size()
@@ -757,8 +756,8 @@ HWTEST_F(DistributedKvDataManagerTest, DistribitedKvDataManager_Sync_Push_0700,
 
     char strKV[MAX_DATA_LENGTH] = { "math_score_int" };
     strcpy_s(strKV, strlen(stringKey.c_str()) + 1, stringKey.c_str());
-    strcat(strKV, ":");
-    strcat(strKV, strvc.c_str());
+    strcat_s(strKV, MAX_DATA_LENGTH, ":");
+    strcat_s(strKV, MAX_DATA_LENGTH, strvc.c_str());
 
     std::cout << "strvc = " << strvc << std::endl;
     std::cout << "strvc.c_str() = " << strvc.c_str() << std::endl;
@@ -1443,8 +1442,8 @@ HWTEST_F(DistributedKvDataManagerTest, DistribitedKvDataManager_Sync_Pull_0700,
 
     char strKV[MAX_DATA_LENGTH] = { "math_score_int" };
     strcpy_s(strKV, strlen(stringKey.c_str()) + 1, stringKey.c_str());
-    strcat(strKV, ":");
-    strcat(strKV, strvc.c_str());
+    strcat_s(strKV, MAX_DATA_LENGTH, ":");
+    strcat_s(strKV, MAX_DATA_LENGTH, strvc.c_str());
 
     std::cout << "strvc = " << strvc << std::endl;
     std::cout << "strvc.c_str() = " << strvc.c_str() << std::endl;
@@ -2497,8 +2496,8 @@ HWTEST_F(DistributedKvDataManagerTest, SubscribeWithQuery_0700, TestSize.Level1)
 
     char strKV[MAX_DATA_LENGTH] = { "math_score_int" };
     strcpy_s(strKV, strlen(stringKey.c_str()) + 1, stringKey.c_str());
-    strcat(strKV, ":");
-    strcat(strKV, strvc.c_str());
+    strcat_s(strKV, MAX_DATA_LENGTH, ":");
+    strcat_s(strKV, MAX_DATA_LENGTH, strvc.c_str());
     DisKvTest::RemotePutData(strKV);
     // 5.远端getvect
     LOG("%s 5.远端get vect ", LOGSTR);
@@ -2844,8 +2843,8 @@ HWTEST_F(DistributedKvDataManagerTest, SyncWithCondition_0700, TestSize.Level1)
     strvc.assign(vect2.begin(), vect2.end());
     char strKV[MAX_DATA_LENGTH] = { "math_score_int" };
     strcpy_s(strKV, strlen(stringKey.c_str()) + 1, stringKey.c_str());
-    strcat(strKV, ":");
-    strcat(strKV, strvc.c_str());
+    strcat_s(strKV, MAX_DATA_LENGTH, ":");
+    strcat_s(strKV, MAX_DATA_LENGTH, strvc.c_str());
     std::cout << "strvc = " << strvc << std::endl;
     std::cout << "strvc.c_str() = " << strvc.c_str() << std::endl;
     std::cout << "strKV = " << strKV << std::endl;