From 98a5ad09f0603b8dde1b15ec77ba89c239f0c7aa Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Tue, 24 Aug 2021 12:12:14 +0800
Subject: [PATCH] [TD-5466]<fix> handle invalid Escapes

---
 src/kit/shell/src/shellEngine.c | 8 ++++++--
 src/util/src/tcompare.c         | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/kit/shell/src/shellEngine.c b/src/kit/shell/src/shellEngine.c
index bf19394d05..efc37403b4 100644
--- a/src/kit/shell/src/shellEngine.c
+++ b/src/kit/shell/src/shellEngine.c
@@ -254,8 +254,12 @@ int32_t shellRunCommand(TAOS* con, char* command) {
     }
 
     if (c == '\\') {
-      esc = true;
-      continue;
+      if (quote != 0 && (*command == '_' || *command == '\\')) {
+        //DO nothing 
+      } else {
+        esc = true;
+        continue;
+      }
     }
 
     if (quote == c) {
diff --git a/src/util/src/tcompare.c b/src/util/src/tcompare.c
index 36480418c9..cbb6747052 100644
--- a/src/util/src/tcompare.c
+++ b/src/util/src/tcompare.c
@@ -262,6 +262,7 @@ int patternMatch(const char *patterStr, const char *str, size_t size, const SPat
     c1 = str[j++];
     
     if (j <= size) {
+      if (c == '\\' && patterStr[i] == '_' && c1 == '_') { i++; continue; }
       if (c == c1 || tolower(c) == tolower(c1) || (c == pInfo->matchOne && c1 != 0)) {
         continue;
       }