From f007bdf8f69412c8cd3119f20550d80b50da4e5d Mon Sep 17 00:00:00 2001
From: Bomin Zhang <bmzhang@taosdata.com>
Date: Fri, 26 Jun 2020 15:40:15 +0800
Subject: [PATCH 1/2] fix some coverity issues

---
 src/client/src/tscLocalMerge.c  | 5 ++++-
 src/client/src/tscParseInsert.c | 5 ++++-
 src/client/src/tscSubquery.c    | 6 ++++--
 src/cq/test/cqtest.c            | 2 +-
 src/query/src/qExecutor.c       | 2 +-
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/client/src/tscLocalMerge.c b/src/client/src/tscLocalMerge.c
index a731fbae8e..db85b7a5e5 100644
--- a/src/client/src/tscLocalMerge.c
+++ b/src/client/src/tscLocalMerge.c
@@ -315,7 +315,10 @@ void tscCreateLocalReducer(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tOrd
 
   pReducer->finalRowSize = tscGetResRowLength(pQueryInfo->exprList);
   pReducer->resColModel = finalmodel;
-  pReducer->resColModel->capacity = pReducer->nResultBufSize / pReducer->finalRowSize;
+  pReducer->resColModel->capacity = pReducer->nResultBufSize;
+  if (pReducer->finalRowSize > 0) {
+    pReducer->resColModel->capacity /= pReducer->finalRowSize;
+  }
   assert(pReducer->finalRowSize <= pReducer->rowSize);
 
   pReducer->pFinalRes = calloc(1, pReducer->rowSize * pReducer->resColModel->capacity);
diff --git a/src/client/src/tscParseInsert.c b/src/client/src/tscParseInsert.c
index 1db4108d22..c237dbbe1d 100644
--- a/src/client/src/tscParseInsert.c
+++ b/src/client/src/tscParseInsert.c
@@ -802,7 +802,10 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql) {
     }
 
     STableMetaInfo *pSTableMeterMetaInfo = tscGetMetaInfo(pQueryInfo, STABLE_INDEX);
-    tscSetTableFullName(pSTableMeterMetaInfo, &sToken, pSql);
+    code = tscSetTableFullName(pSTableMeterMetaInfo, &sToken, pSql);
+    if (code != TSDB_CODE_SUCCESS) {
+      return code;
+    }
 
     tstrncpy(pTag->name, pSTableMeterMetaInfo->name, sizeof(pTag->name));
     code = tscGetTableMeta(pSql, pSTableMeterMetaInfo);
diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index e6daab99c6..32b8129d02 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -936,8 +936,10 @@ static SJoinSupporter* tscUpdateSubqueryStatus(SSqlObj* pSql, int32_t numOfFetch
     }
   }
   
-  pState->numOfTotal = pSql->numOfSubs;
-  pState->numOfRemain = numOfFetch;
+  if (pState != NULL) {
+    pState->numOfTotal = pSql->numOfSubs;
+    pState->numOfRemain = numOfFetch;
+  }
   
   return pSupporter;
 }
diff --git a/src/cq/test/cqtest.c b/src/cq/test/cqtest.c
index d06f14d53f..1daee644a7 100644
--- a/src/cq/test/cqtest.c
+++ b/src/cq/test/cqtest.c
@@ -76,7 +76,7 @@ int main(int argc, char *argv[]) {
   tdFreeSchema(pSchema);
 
   while (1) {
-    char c = getchar();
+    char c = (char)getchar();
     
     switch(c) {
       case 's':
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index ed529db92e..76bdaf7c36 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -5901,7 +5901,7 @@ int32_t qCreateQueryInfo(void *tsdb, int32_t vgId, SQueryTableMsg *pQueryMsg, qi
 
   if ((code = convertQueryMsg(pQueryMsg, &pTableIdList, &pExprMsg, &tagCond, &tbnameCond, &pGroupColIndex, &pTagColumnInfo)) !=
          TSDB_CODE_SUCCESS) {
-    return code;
+    goto _over;
   }
 
   if (pQueryMsg->numOfTables <= 0) {

From 51439cb76ff4f20a4cb8cb0f23116b559df0d231 Mon Sep 17 00:00:00 2001
From: Bomin Zhang <bmzhang@taosdata.com>
Date: Sun, 28 Jun 2020 18:18:48 +0800
Subject: [PATCH 2/2] add assert as condition should not be true

---
 src/client/src/tscLocalMerge.c | 1 +
 src/client/src/tscSubquery.c   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/client/src/tscLocalMerge.c b/src/client/src/tscLocalMerge.c
index db85b7a5e5..fba685e703 100644
--- a/src/client/src/tscLocalMerge.c
+++ b/src/client/src/tscLocalMerge.c
@@ -316,6 +316,7 @@ void tscCreateLocalReducer(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tOrd
   pReducer->finalRowSize = tscGetResRowLength(pQueryInfo->exprList);
   pReducer->resColModel = finalmodel;
   pReducer->resColModel->capacity = pReducer->nResultBufSize;
+  assert(pReducer->finalRowSize > 0);
   if (pReducer->finalRowSize > 0) {
     pReducer->resColModel->capacity /= pReducer->finalRowSize;
   }
diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index 32b8129d02..6e94fd5635 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -936,6 +936,7 @@ static SJoinSupporter* tscUpdateSubqueryStatus(SSqlObj* pSql, int32_t numOfFetch
     }
   }
   
+  assert(pState != NULL);
   if (pState != NULL) {
     pState->numOfTotal = pSql->numOfSubs;
     pState->numOfRemain = numOfFetch;