diff --git a/src/client/src/tscSecondaryMerge.c b/src/client/src/tscSecondaryMerge.c
index 5eebddca7319920e6252ffc279f3e15cdd73225f..737c1342d8b8d852a9fa66fd8c5635be15b4d911 100644
--- a/src/client/src/tscSecondaryMerge.c
+++ b/src/client/src/tscSecondaryMerge.c
@@ -1314,8 +1314,10 @@ int32_t tscLocalDoReduce(SSqlObj *pSql) {
     tscTrace("%s call the drop local reducer", __FUNCTION__);
 
     tscDestroyLocalReducer(pSql);
-    pRes->numOfRows = 0;
-    pRes->row = 0;
+    if (pRes) {
+      pRes->numOfRows = 0;
+      pRes->row = 0;
+    }
     return 0;
   }
 
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 1805eac38dcd1414fbcd4af6f758ce7778ebcc79..ed21a82be1ff56f531e7949f043f2e9a92c6c888 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -2312,6 +2312,7 @@ int tscBuildCreateTableMsg(SSqlObj *pSql) {
   size = tscEstimateCreateTableMsgLength(pSql);
   if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, size)) {
     tscError("%p failed to malloc for create table msg", pSql);
+    free(tmpData); 
     return -1;
   }
 
diff --git a/src/client/src/tscSystem.c b/src/client/src/tscSystem.c
index 60b90ac32884d9a3f55d2e9dbfca356f0725d734..2ebd1cfc516156aa2628036383e316f568db6dcc 100644
--- a/src/client/src/tscSystem.c
+++ b/src/client/src/tscSystem.c
@@ -230,7 +230,7 @@ static int taos_options_imp(TSDB_OPTION option, const char *pStr) {
         return -1;
       }
 
-      if (cfg && cfg && cfg->cfgStatus <= TSDB_CFG_CSTATUS_OPTION) {
+      if (cfg && cfg->cfgStatus <= TSDB_CFG_CSTATUS_OPTION) {
         char sep = '.';
 
         if (strlen(tsLocale) == 0) { // locale does not set yet