From 928473f0cbf77e3910539d6b8357c43c9caa9006 Mon Sep 17 00:00:00 2001
From: markswang <792637585@qq.com>
Date: Tue, 27 Jul 2021 18:27:35 +0800
Subject: [PATCH] [TD-5534]<fix>:fix the coverity high risk of client

---
 src/client/src/tscParseLineProtocol.c | 2 +-
 src/client/src/tscPrepare.c           | 4 ++--
 src/client/src/tscSQLParser.c         | 2 +-
 src/client/src/tscServer.c            | 2 +-
 src/client/src/tscUtil.c              | 6 +-----
 src/query/inc/qExecutor.h             | 1 -
 src/query/src/qExecutor.c             | 2 +-
 7 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/client/src/tscParseLineProtocol.c b/src/client/src/tscParseLineProtocol.c
index 4b5416c6b9..1790403a5e 100644
--- a/src/client/src/tscParseLineProtocol.c
+++ b/src/client/src/tscParseLineProtocol.c
@@ -1653,7 +1653,7 @@ static int32_t parseSmlTimeStamp(TAOS_SML_KV **pTS, const char **index) {
 
 static int32_t parseSmlKey(TAOS_SML_KV *pKV, const char **index) {
   const char *cur = *index;
-  char key[TSDB_COL_NAME_LEN + 1];  // +1 to avoid 1685 line over write
+  char key[TSDB_COL_NAME_LEN + 1];  // +1 to avoid key[len] over write
   uint16_t len = 0;
 
   //key field cannot start with digit
diff --git a/src/client/src/tscPrepare.c b/src/client/src/tscPrepare.c
index 9ff3a0e2dd..2c2a299549 100644
--- a/src/client/src/tscPrepare.c
+++ b/src/client/src/tscPrepare.c
@@ -1628,8 +1628,8 @@ int taos_stmt_set_tbname_tags(TAOS_STMT* stmt, const char* name, TAOS_BIND* tags
   if (pStmt->mtb.subSet && taosHashGetSize(pStmt->mtb.pTableHash) > 0) {
     STableMetaInfo* pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, 0);
     STableMeta* pTableMeta = pTableMetaInfo->pTableMeta;
-    char sTableName[TSDB_TABLE_FNAME_LEN + 1] = {0};
-    strncpy(sTableName, pTableMeta->sTableName, sizeof(sTableName) - 1);
+    char sTableName[TSDB_TABLE_FNAME_LEN] = {0};
+    tstrncpy(sTableName, pTableMeta->sTableName, sizeof(sTableName));
 
     SStrToken tname = {0};
     tname.type = TK_STRING;
diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 1fac9c9a40..e899cc3a07 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -8366,7 +8366,7 @@ static int32_t doValidateSubquery(SSqlNode* pSqlNode, int32_t index, SSqlObj* pS
       return invalidOperationMsg(msgBuf, "subquery alias name too long");
     }
 
-    strncpy(pTableMetaInfo1->aliasName, subInfo->aliasName.z, MIN(subInfo->aliasName.n, sizeof(pTableMetaInfo1->aliasName) - 1));
+    tstrncpy(pTableMetaInfo1->aliasName, subInfo->aliasName.z, MIN(subInfo->aliasName.n, sizeof(pTableMetaInfo1->aliasName)));
   }
 
   taosArrayPush(pQueryInfo->pUpstream, &pSub);
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 0748780e1a..f3c24eb407 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -164,7 +164,7 @@ static void tscUpdateVgroupInfo(SSqlObj *pSql, SRpcEpSet *pEpSet) {
   vgroupInfo.inUse    = pEpSet->inUse;
   vgroupInfo.numOfEps = pEpSet->numOfEps;
   for (int32_t i = 0; i < vgroupInfo.numOfEps; i++) {
-    strncpy(vgroupInfo.ep[i].fqdn, pEpSet->fqdn[i], TSDB_FQDN_LEN);   // buffer not null terminated risk
+    tstrncpy(vgroupInfo.ep[i].fqdn, pEpSet->fqdn[i], TSDB_FQDN_LEN);   // buffer not null terminated risk
     vgroupInfo.ep[i].port = pEpSet->port[i];
   }
 
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 7e36cce50e..27fc19b205 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -1236,10 +1236,6 @@ void handleDownstreamOperator(SSqlObj** pSqlObjList, int32_t numOfUpstream, SQue
       }
 
       pSourceOperator = createJoinOperatorInfo(p, px->numOfTables, schema, num);
-
-      for(int32_t i = 0; i < px->numOfTables; ++i) {
-        destroyOperatorInfo(p[i]);
-      }
       tfree(p);
     } else {
       size_t num = taosArrayGetSize(px->colList);
@@ -4714,7 +4710,7 @@ static int32_t doAddTableName(char* nextStr, char** str, SArray* pNameArray, SSq
   int32_t len = 0;
 
   if (nextStr == NULL) {
-    strncpy(tablename, *str, TSDB_TABLE_FNAME_LEN - 1);
+    tstrncpy(tablename, *str, TSDB_TABLE_FNAME_LEN);
     len = (int32_t) strlen(tablename);
   } else {
     len = (int32_t)(nextStr - (*str));
diff --git a/src/query/inc/qExecutor.h b/src/query/inc/qExecutor.h
index 71e9792bd8..4581ba258d 100644
--- a/src/query/inc/qExecutor.h
+++ b/src/query/inc/qExecutor.h
@@ -578,7 +578,6 @@ void doCompactSDataBlock(SSDataBlock* pBlock, int32_t numOfRows, int8_t* p);
 SSDataBlock* createOutputBuf(SExprInfo* pExpr, int32_t numOfOutput, int32_t numOfRows);
 void* destroyOutputBuf(SSDataBlock* pBlock);
 void* doDestroyFilterInfo(SSingleColumnFilterInfo* pFilterInfo, int32_t numOfFilterCols);
-void destroyOperatorInfo(SOperatorInfo* pOperator);
 
 void setInputDataBlock(SOperatorInfo* pOperator, SQLFunctionCtx* pCtx, SSDataBlock* pBlock, int32_t order);
 int32_t getNumOfResult(SQueryRuntimeEnv *pRuntimeEnv, SQLFunctionCtx* pCtx, int32_t numOfOutput);
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 11624ddffc..6c18419619 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -5949,7 +5949,7 @@ static int32_t getNumOfScanTimes(SQueryAttr* pQueryAttr) {
   return 1;
 }
 
-void destroyOperatorInfo(SOperatorInfo* pOperator) {
+static void destroyOperatorInfo(SOperatorInfo* pOperator) {
   if (pOperator == NULL) {
     return;
   }