diff --git a/source/util/src/version.c.in b/source/util/src/version.c.in
index be1a4a4048..cb307b57fc 100644
--- a/source/util/src/version.c.in
+++ b/source/util/src/version.c.in
@@ -1,4 +1,4 @@
-char version[12] = "${TD_VER_NUMBER}";
+char version[64] = "${TD_VER_NUMBER}";
 char compatible_version[12] = "${TD_VER_COMPATIBLE}";
 char gitinfo[48] = "${TD_VER_GIT}";
 char buildinfo[64] = "Built at ${TD_VER_DATE}";
diff --git a/tools/shell/src/shellEngine.c b/tools/shell/src/shellEngine.c
index 10e806e041..84987f80ec 100644
--- a/tools/shell/src/shellEngine.c
+++ b/tools/shell/src/shellEngine.c
@@ -320,17 +320,19 @@ void shellDumpFieldToFile(TdFilePtr pFile, const char *val, TAOS_FIELD *field, i
     case TSDB_DATA_TYPE_BINARY:
     case TSDB_DATA_TYPE_NCHAR:
     case TSDB_DATA_TYPE_JSON:
-      int32_t bufIndex = 0;
-      for (int32_t i = 0; i < length; i++) {
-        buf[bufIndex] = val[i];
-        bufIndex++;
-        if (val[i] == '\"') {
+      {
+        int32_t bufIndex = 0;
+        for (int32_t i = 0; i < length; i++) {
           buf[bufIndex] = val[i];
           bufIndex++;
+          if (val[i] == '\"') {
+            buf[bufIndex] = val[i];
+            bufIndex++;
+          }
         }
+        buf[bufIndex] = 0;
+        taosFprintfFile(pFile, "%s%s%s", quotationStr, buf, quotationStr);
       }
-      buf[bufIndex] = 0;
-      taosFprintfFile(pFile, "%s%s%s", quotationStr, buf, quotationStr);
       break;
     case TSDB_DATA_TYPE_TIMESTAMP:
       shellFormatTimestamp(buf, *(int64_t *)val, precision);