diff --git a/aw/cxx/distributed/distributed_major.cpp b/aw/cxx/distributed/distributed_major.cpp index 87a243e9c16dbdfc1baba632d892b07d7ed51a4a..71163382d6006c5dc2e3219100facbc116b5f62c 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) { diff --git a/examples/distributedb/test/distributedtest/common/distribute_demo_agent.cpp b/examples/distributedb/test/distributedtest/common/distribute_demo_agent.cpp index 95dab2bc559b84e81ae266e7a1548826e1161287..e62b8db5756719a9079541e88f06d45985f60068 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.";