From 23332951bf9b3062323a5596564c5527ae7f73d4 Mon Sep 17 00:00:00 2001 From: wangmm0220 Date: Thu, 2 Sep 2021 15:15:59 +0800 Subject: [PATCH] [TD-5992] modify return msg --- src/client/src/tscSystem.c | 8 ++++---- src/client/tests/setConfigTest.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/client/src/tscSystem.c b/src/client/src/tscSystem.c index 2765907ab0..633d590e3d 100644 --- a/src/client/src/tscSystem.c +++ b/src/client/src/tscSystem.c @@ -478,11 +478,11 @@ static setConfRet taos_set_config_imp(const char *config){ if(!taosReadConfigOption(item->string, item->valuestring, NULL, NULL, TAOS_CFG_CSTATUS_OPTION, TSDB_CFG_CTYPE_B_CLIENT)){ ret.retCode = -1; if (strlen(ret.retMsg) == 0){ - snprintf(ret.retMsg, 1000, "part error|%s", item->string); + snprintf(ret.retMsg, 1024, "part error|%s", item->string); }else{ - char tmp[1024] = {0}; - strcpy(tmp, ret.retMsg); - snprintf(ret.retMsg, 1000, "%s|%s", tmp, item->string); + char tmp[1000] = {0}; + strncpy(tmp, ret.retMsg, 1000); + snprintf(ret.retMsg, 1024, "%s|%s", tmp, item->string); } } } diff --git a/src/client/tests/setConfigTest.cpp b/src/client/tests/setConfigTest.cpp index 9b982741b7..1b3f74c189 100644 --- a/src/client/tests/setConfigTest.cpp +++ b/src/client/tests/setConfigTest.cpp @@ -14,7 +14,7 @@ TEST(testCase, set_config_test1) { const char *config2 = "{\"debugFlag\":\"199\"}"; ret = taos_set_config(config2); // not take effect - ASSERT_EQ(ret.retCode, -5) + ASSERT_EQ(ret.retCode, -5); printf("msg:%d->%s", ret.retCode, ret.retMsg); bool readResult = taosReadGlobalCfg(); // load file config, debugFlag not take effect @@ -57,7 +57,7 @@ TEST(testCase, set_config_test4) { } TEST(testCase, set_config_test5) { - const char *config = "ddd"; + const char *config = "\"ddd\""; setConfRet ret = taos_set_config(config); ASSERT_EQ(ret.retCode, -3); printf("msg:%d->%s", ret.retCode, ret.retMsg); -- GitLab