diff --git a/src/client/src/tscLocalMerge.c b/src/client/src/tscLocalMerge.c
index 0ce64df647..8919d872a6 100644
--- a/src/client/src/tscLocalMerge.c
+++ b/src/client/src/tscLocalMerge.c
@@ -315,7 +315,11 @@ 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;
+  assert(pReducer->finalRowSize > 0);
+  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 124e093b70..6fac028049 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 02c2511a58..0c2e3f3a1c 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -936,8 +936,11 @@ static SJoinSupporter* tscUpdateSubqueryStatus(SSqlObj* pSql, int32_t numOfFetch
     }
   }
   
-  pState->numOfTotal = pSql->numOfSubs;
-  pState->numOfRemain = numOfFetch;
+  assert(pState != NULL);
+  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 e4be6d940b..8f565cd9c6 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -5910,7 +5910,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) {