From f2cce5b6d6c6f2b57d1cdad1f2da55f1d94b7a50 Mon Sep 17 00:00:00 2001 From: stivn <9699603+stivn@user.noreply.gitee.com> Date: Fri, 31 Dec 2021 10:46:41 +0000 Subject: [PATCH 1/2] update aw/cxx/distributed/distributed_major.cpp. Signed-off-by: stivn --- aw/cxx/distributed/distributed_major.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/aw/cxx/distributed/distributed_major.cpp b/aw/cxx/distributed/distributed_major.cpp index 87a243e..7116338 100644 --- a/aw/cxx/distributed/distributed_major.cpp +++ b/aw/cxx/distributed/distributed_major.cpp @@ -48,9 +48,9 @@ DistributeTestEnvironment::DistributeTestEnvironment() : serverPort_(DEFAULT_AGE { } -DistributeTestEnvironment::DistributeTestEnvironment(std::string cfgInfo) : serverPort_(DEFAULT_AGENT_PORT) +DistributeTestEnvironment::DistributeTestEnvironment(std::string cfgFile) : serverPort_(DEFAULT_AGENT_PORT) { - Init(cfgInfo); + Init(cfgFile); } void DistributeTestEnvironment::Init(std::string fileName) @@ -251,8 +251,10 @@ 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); - + ret = memset_s(szbuf, sizeof(szbuf), 0, MAX_BUFF_LEN); + if (ret != EOK) { + return breturn; + } // add 2 '\0' size_t rlen = cmdLen + expectValueLen + DST_COMMAND_HEAD_LEN + sizeof(int)*HALF_BUF_LEN + HALF_BUF_LEN; if (rlen <= MAX_BUFF_LEN) { -- Gitee From 6cfb8042de6f0f5f68da8acd632412e99e09266e Mon Sep 17 00:00:00 2001 From: stivn <9699603+stivn@user.noreply.gitee.com> Date: Fri, 31 Dec 2021 10:50:27 +0000 Subject: [PATCH 2/2] update examples/distributedb/test/distributedtest/common/distribute_demo_agent.cpp. Signed-off-by: stivn --- .../test/distributedtest/common/distribute_demo_agent.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/distributedb/test/distributedtest/common/distribute_demo_agent.cpp b/examples/distributedb/test/distributedtest/common/distribute_demo_agent.cpp index 95dab2b..e62b8db 100644 --- a/examples/distributedb/test/distributedtest/common/distribute_demo_agent.cpp +++ b/examples/distributedb/test/distributedtest/common/distribute_demo_agent.cpp @@ -104,7 +104,7 @@ bool DistributeDemoAgent::TearDown() // The entry of handlingthe major test case message int DistributeDemoAgent::OnProcessMsg(const std::string &strMsg, int len, - std::string &strReturnValue, int returnValueLen) + std::string &strReturnValue, int returnBufLen) { int nret = 0; std::string returnStr = "agent return message."; -- Gitee