diff --git a/src/kit/taosdemo/CMakeLists.txt b/src/kit/taosdemo/CMakeLists.txt
index ba27044a8793fec53adc3b85df77443cbf18c600..4e38a8842e2f3d182dc4d038a7b44a619205b7f7 100644
--- a/src/kit/taosdemo/CMakeLists.txt
+++ b/src/kit/taosdemo/CMakeLists.txt
@@ -9,19 +9,18 @@ IF (GIT_FOUND)
     EXECUTE_PROCESS(
         COMMAND ${GIT_EXECUTABLE} log --pretty=oneline -n 1 ${CMAKE_CURRENT_LIST_DIR}/taosdemo.c
         RESULT_VARIABLE RESULT
-        OUTPUT_VARIABLE TAOSDEMO_COMMIT)
-    EXECUTE_PROCESS(
-        COMMAND bash "-c" "echo '${TAOSDEMO_COMMIT}' | awk '{print $1}' | cut -c -9"
-        RESULT_VARIABLE RESULT
         OUTPUT_VARIABLE TAOSDEMO_COMMIT_SHA1)
+    STRING(SUBSTRING "${TAOSDEMO_COMMIT_SHA1}" 0 7 TAOSDEMO_COMMIT_SHA1)
     EXECUTE_PROCESS(
         COMMAND ${GIT_EXECUTABLE} status -z -s ${CMAKE_CURRENT_LIST_DIR}/taosdemo.c
         RESULT_VARIABLE RESULT
         OUTPUT_VARIABLE TAOSDEMO_STATUS)
-    EXECUTE_PROCESS(
+    IF (TD_LINUX)
+      EXECUTE_PROCESS(
         COMMAND bash "-c" "echo '${TAOSDEMO_STATUS}' | awk '{print $1}'"
         RESULT_VARIABLE RESULT
         OUTPUT_VARIABLE TAOSDEMO_STATUS)
+    ENDIF (TD_LINUX)
     MESSAGE("taosdemo.c status: " ${TAOSDEMO_STATUS})
 ELSE()
     MESSAGE("Git not found")
@@ -29,9 +28,9 @@ ELSE()
     SET(TAOSDEMO_STATUS "unknown")
 ENDIF (GIT_FOUND)
 
-STRING(STRIP ${TAOSDEMO_COMMIT_SHA1} TAOSDEMO_COMMIT_SHA1)
+STRING(STRIP "${TAOSDEMO_COMMIT_SHA1}" TAOSDEMO_COMMIT_SHA1)
 MESSAGE("taosdemo's latest commit in short is:" ${TAOSDEMO_COMMIT_SHA1})
-STRING(STRIP ${TAOSDEMO_STATUS} TAOSDEMO_STATUS)
+STRING(STRIP "${TAOSDEMO_STATUS}" TAOSDEMO_STATUS)
 
 IF (TAOSDEMO_STATUS MATCHES "M")
     SET(TAOSDEMO_STATUS "modified")
diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index 87a08dee49da3c6c2aaadb9c3d93006db58f57be..edd7b86b1b5c03a976ebb25ce4cd9dddb2443402 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -769,6 +769,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
                   && strcasecmp(token, "BINARY")
                   && strcasecmp(token, "NCHAR")) {
             printHelp();
+            free(dupstr);
             ERROR_EXIT("Invalid data_type!\n");
             exit(EXIT_FAILURE);
           }
@@ -776,6 +777,7 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
           token = strsep(&running, ",");
           if (index >= MAX_NUM_DATATYPE) break;
         }
+        free(dupstr);
         sptr[index] = NULL;
       }
     } else if (strcmp(argv[i], "-w") == 0) {
diff --git a/src/kit/taosdump/taosdump.c b/src/kit/taosdump/taosdump.c
index 9f176904fef87a4d4da7005c783aac1a00d1aa6b..fd6ee9f2fcf9c3b3e64fb26f6b337eb1e8d879fc 100644
--- a/src/kit/taosdump/taosdump.c
+++ b/src/kit/taosdump/taosdump.c
@@ -483,25 +483,29 @@ static int queryDbImpl(TAOS *taos, char *command) {
 static void parse_args(int argc, char *argv[], SArguments *arguments) {
   for (int i = 1; i < argc; i++) {
     if (strcmp(argv[i], "-E") == 0) {
-      if (argv[i+1]) {
-        char *tmp = argv[++i];
+      char *tmp = strdup(argv[++i]);
+
+      if (tmp) {
         int64_t tmpEpoch;
         if (strchr(tmp, ':') && strchr(tmp, '-')) {
           if (TSDB_CODE_SUCCESS != taosParseTime(
-                    tmp, &tmpEpoch, strlen(tmp), TSDB_TIME_PRECISION_MILLI, 0)) {
+                      tmp, &tmpEpoch, strlen(tmp), TSDB_TIME_PRECISION_MILLI, 0)) {
             fprintf(stderr, "Input end time error!\n");
+            free(tmp);
             return;
           }
         } else {
           tmpEpoch = atoll(tmp);
         }
-
+  
         sprintf(argv[i], "%"PRId64"", tmpEpoch);
         debugPrint("%s() LN%d, tmp is: %s, argv[%d]: %s\n",
-             __func__, __LINE__, tmp, i, argv[i]);
+               __func__, __LINE__, tmp, i, argv[i]);
+
+        free(tmp);
       } else {
-        fprintf(stderr, "Input end time error!\n");
-        return;
+        errorPrint("%s() LN%d, strdup() cannot allocate memory\n", __func__, __LINE__);
+        exit(-1);
       }
     } else if (strcmp(argv[i], "-g") == 0) {
       arguments->debug_print = true;