diff --git a/README.md b/README.md
index d3fecc090e6f7cc49e3e888379bd3582aa4ae4f1..fb26e349df182d55b3b23ee90bb28fd4c56841a2 100755
--- a/README.md
+++ b/README.md
@@ -215,7 +215,7 @@ The Python environment is required.
         </test_cases>
         ```
 
-    2.  For devices that only support serial port connection, specify the NFS directory on the PC \(**host\_dir**\) and the corresponding directory on the board \(**board\_dir**\) between the  **<NFS\>**  tags. For example:
+    2.  For devices that only support serial port connection, specify the NFS directory on the PAD \(**host\_dir**\) and the corresponding directory on the board \(**board\_dir**\) between the  **<NFS\>**  tags. For example:
 
         ```
         <NFS>
diff --git a/README_zh.md b/README_zh.md
index a518adb75b86d5b4d6f6d757d79a8ae3bd19a8ea..c70ac607e126a0201cb202588a2543c058791160 100755
--- a/README_zh.md
+++ b/README_zh.md
@@ -703,7 +703,7 @@ subsystem  # 子系统
   <coverage>
     <outpath></outpath>
   </coverage>
-  <!-- NFS挂载信息配置，被测设备仅支持串口连接时配置，指定NFS的映射路径，host_dir为PC侧的NFS目录，board_dir为板侧创建的目录 -->
+  <!-- NFS挂载信息配置，被测设备仅支持串口连接时配置，指定NFS的映射路径，host_dir为主机侧的NFS目录，board_dir为板侧创建的目录 -->
   <NFS>
     <host_dir></host_dir>
     <mnt_cmd></mnt_cmd>
diff --git a/aw/cxx/distributed/distributed_agent.cpp b/aw/cxx/distributed/distributed_agent.cpp
index a8d5a5e38f80ddc568018331e582a06a1e651fd4..51a7f7ef78d0b265ea9a9271e25f31244c196339 100644
--- a/aw/cxx/distributed/distributed_agent.cpp
+++ b/aw/cxx/distributed/distributed_agent.cpp
@@ -147,7 +147,7 @@ int DistributedAgent::DoCmdServer(int serverSockFd)
     HiLog::Info(DistributedAgent::LABEL, "accept testcase runner IP:%s port:%d \n",
                 inet_ntoa(clientAddr.sin_addr), clientAddr.sin_port);
     while (mbStop_ != true) {
-        memset_s(buff, MAX_BUFF_LEN, 0, MAX_BUFF_LEN);
+        memset_s(buff, sizeof(buff), 0, MAX_BUFF_LEN);
         // every cmd length less than MAX_BUFF_LEN bytes;
         int cmdLen = recv(clientSockFd_, buff, DST_COMMAND_HEAD_LEN, 0);
         if (static_cast<unsigned long>(cmdLen) <  DST_COMMAND_HEAD_LEN) {
@@ -190,7 +190,7 @@ int DistributedAgent::DoCmdServer(int serverSockFd)
                     }
                     pszEValue[eValueLen] = '\0';
                     int nresult = OnProcessCmd(pAlignmentCmd, cmdLen, pszEValue, eValueLen);
-                    (void)memset_s(returnValue, MAX_BUFF_LEN, 0, MAX_BUFF_LEN);
+                    (void)memset_s(returnValue, sizeof(returnValue), 0, MAX_BUFF_LEN);
                     auto pclinereturn = reinterpret_cast<DistributedMsg *>(returnValue);
                     pclinereturn->no = pcline->no;
                     pclinereturn->cmdTestType = htons(DST_COMMAND_CALL);
@@ -206,7 +206,7 @@ int DistributedAgent::DoCmdServer(int serverSockFd)
                 }
                 case DST_COMMAND_MSG: {
                     int nresult = 0;
-                    (void)memset_s(returnValue, MAX_BUFF_LEN, 0, MAX_BUFF_LEN);
+                    (void)memset_s(returnValue, sizeof(returnValue), 0, MAX_BUFF_LEN);
                     auto pclinereturn = reinterpret_cast<DistributedMsg *>(returnValue);
                     pclinereturn->no = pcline->no;
                     pclinereturn->cmdTestType = htons(DST_COMMAND_MSG);
@@ -246,7 +246,7 @@ void DistributedAgent::OnNotifyImf(DistributedMsg *pcline)
     char alignmentCmd[DistributedAgent::CMD_LENGTH];
     char szMsg[MAX_BUFF_LEN / DistributedAgent::HALF_NUM - DistributedAgent::CMD_LENGTH];
     int cmdNo = 0;
-    (void)memset_s(alignmentCmd, DistributedAgent::CMD_LENGTH, 0, DistributedAgent::CMD_LENGTH);
+    (void)memset_s(alignmentCmd, sizeof(alignmentCmd), 0, DistributedAgent::CMD_LENGTH);
     (void)memset_s(szMsg,
         MAX_BUFF_LEN / DistributedAgent::HALF_NUM - DistributedAgent::CMD_LENGTH, 0,
         MAX_BUFF_LEN / DistributedAgent::HALF_NUM - DistributedAgent::CMD_LENGTH);
@@ -259,7 +259,7 @@ void DistributedAgent::OnNotifyImf(DistributedMsg *pcline)
         HiLog::Error(DistributedAgent::LABEL, "error command.\n");
     }  else {
         errno_t ret = EOK;
-        ret = memcpy_s(alignmentCmd, DistributedAgent::CMD_LENGTH, pcline->alignmentCmd, cmdNo);
+        ret = memcpy_s(alignmentCmd, sizeof(alignmentCmd), pcline->alignmentCmd, cmdNo);
         if (ret != EOK) {
             return;
         }
@@ -311,7 +311,7 @@ int DistributedAgent::OnProcessCmd(const std::string &strCommand, int cmdLen,
     char szArgs[MAX_BUFF_LEN / DistributedAgent::HALF_NUM - DistributedAgent::CMD_LENGTH];
     int cmdNo = 0;
 
-    (void)memset_s(alignmentCmd, DistributedAgent::CMD_LENGTH, 0, DistributedAgent::CMD_LENGTH);
+    (void)memset_s(alignmentCmd, sizeof(alignmentCmd), 0, DistributedAgent::CMD_LENGTH);
     (void)memset_s(szArgs,
         MAX_BUFF_LEN / DistributedAgent::HALF_NUM - DistributedAgent::CMD_LENGTH, 0,
         MAX_BUFF_LEN / DistributedAgent::HALF_NUM - DistributedAgent::CMD_LENGTH);
@@ -327,7 +327,7 @@ int DistributedAgent::OnProcessCmd(const std::string &strCommand, int cmdLen,
     }
 
     errno_t ret = EOK;
-    ret = memcpy_s(alignmentCmd, DistributedAgent::CMD_LENGTH, strCommand.c_str(), cmdNo);
+    ret = memcpy_s(alignmentCmd, sizeof(alignmentCmd), strCommand.c_str(), cmdNo);
     if (ret != EOK) {
         return -1;
     }
diff --git a/aw/cxx/distributed/distributed_major.cpp b/aw/cxx/distributed/distributed_major.cpp
index 87a243e9c16dbdfc1baba632d892b07d7ed51a4a..6bd6c59f40a955c3cc1af4d6150c8e25150da687 100644
--- a/aw/cxx/distributed/distributed_major.cpp
+++ b/aw/cxx/distributed/distributed_major.cpp
@@ -251,7 +251,7 @@ bool DistributeTestEnvironment::RunTestCmd(size_t devNo, const std::string &strC
     bool breturn = false;
     size_t lenptr = 0;
     errno_t ret = EOK;
-    (void)memset_s(szbuf, MAX_BUFF_LEN, 0, MAX_BUFF_LEN);
+    (void)memset_s(szbuf, sizeof(szbuf), 0, MAX_BUFF_LEN);
 
     // add 2 '\0'
     size_t rlen = cmdLen + expectValueLen + DST_COMMAND_HEAD_LEN + sizeof(int)*HALF_BUF_LEN + HALF_BUF_LEN;
diff --git a/examples/calculator/src/calculator.cpp b/examples/calculator/src/calculator.cpp
index 9b504d69bae9bb8e4aae2a9989089e473f4c8d5c..3195425ce9b6b0d8f7074f56dd788d93e0106e2a 100644
--- a/examples/calculator/src/calculator.cpp
+++ b/examples/calculator/src/calculator.cpp
@@ -31,9 +31,9 @@ int Sub(int e1, int e2)
 }
 
 int Mul(int e1, int e2)
-{
+{    
     int result = e1 * e2;
-    if (!e1 || (result / e1) != e2) {
+    if (!e1 && (result / e1) != e2) {
         result = -1;
     }
     return result;
diff --git a/examples/distributedb/test/distributedtest/common/distribute_demo_agent.cpp b/examples/distributedb/test/distributedtest/common/distribute_demo_agent.cpp
index 95dab2bc559b84e81ae266e7a1548826e1161287..973ec09d8760011249fd96455b6850b1ea5ef1f6 100644
--- a/examples/distributedb/test/distributedtest/common/distribute_demo_agent.cpp
+++ b/examples/distributedb/test/distributedtest/common/distribute_demo_agent.cpp
@@ -186,8 +186,14 @@ int DistributeDemoAgent::AddTwoValue(const std::string &strArgs, int argsLen, co
     int val1 = 0;
     int val2 = 0;
     int val3 = 0;
-    sscanf_s(strArgs.c_str(), "%d %d", &val1, &val2);
-    sscanf_s(strExpectValue.c_str(), "%d", &val3);
+    ret1 = sscanf_s(strArgs.c_str(), "%d %d", &val1, &val2);
+    if(ret1 == -1){
+      return;
+    }
+    ret2 = sscanf_s(strExpectValue.c_str(), "%d", &val3);
+    if(ret2 == -1){
+      return;
+    }
     EXPECT_TRUE(val3 == (val1 + val2));
     return val1 + val2;
 }