[TS-1306]<fix>: fix endless loop with utf-8 replacement character

taosdata · Mar 10, 2022 · 62a05c0 · 62a05c0
1 parent 01777f5
commit 62a05c0
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/kit/shell/src/shellEngine.c b/src/kit/shell/src/shellEngine.c
@@ -545,6 +545,9 @@ static void shellPrintNChar(const char *str, int length, int width) {
     if (bytes <= 0) {
       break;
     }
+    if (pos + bytes > length) {
+      break;
+    }
     int w = 0;
 #ifdef WINDOWS
     w = bytes;
@@ -555,15 +558,11 @@ static void shellPrintNChar(const char *str, int length, int width) {
       w = wcwidth(wc);
     }
 #endif
+    pos += bytes;
     if (w <= 0) {
       continue;
     }
 
-    pos += bytes;
-    if (pos > length) {
-      break;
-    }
-
     if (width <= 0) {
       printf("%lc", wc);
       continue;