diff --git a/source/client/src/clientSmlLine.c b/source/client/src/clientSmlLine.c
index 39280d34dddc22cffd28e863d3849f4184452172..8b11b2957df48b8c5486922525037e614431e567 100644
--- a/source/client/src/clientSmlLine.c
+++ b/source/client/src/clientSmlLine.c
@@ -202,7 +202,7 @@ static int32_t smlParseTagKv(SSmlHandle *info, char **sql, char *sqlEnd, SSmlLin
     bool        keyEscaped = false;
     size_t      keyLenEscaped = 0;
     while (*sql < sqlEnd) {
-      if (unlikely(IS_COMMA(*sql))) {
+      if (unlikely(IS_SPACE(*sql) || IS_COMMA(*sql))) {
         smlBuildInvalidDataMsg(&info->msgBuf, "invalid data", *sql);
         return TSDB_CODE_SML_INVALID_DATA;
       }
@@ -410,7 +410,7 @@ static int32_t smlParseColKv(SSmlHandle *info, char **sql, char *sqlEnd, SSmlLin
     bool        keyEscaped = false;
     size_t      keyLenEscaped = 0;
     while (*sql < sqlEnd) {
-      if (unlikely(IS_COMMA(*sql))) {
+      if (unlikely(IS_SPACE(*sql) || IS_COMMA(*sql))) {
         smlBuildInvalidDataMsg(&info->msgBuf, "invalid data", *sql);
         return TSDB_CODE_SML_INVALID_DATA;
       }
@@ -443,7 +443,14 @@ static int32_t smlParseColKv(SSmlHandle *info, char **sql, char *sqlEnd, SSmlLin
       if (unlikely(*(*sql) == QUOTE && (*(*sql - 1) != SLASH || (*sql - 1) == escapeChar))) {
         isInQuote = !isInQuote;
         (*sql)++;
-        if(!isInQuote) break;
+        if(!isInQuote) {
+          if (unlikely(IS_SPACE(*sql) || IS_COMMA(*sql))) {
+            break;
+          }else{
+            smlBuildInvalidDataMsg(&info->msgBuf, "invalid data", *sql);
+            return TSDB_CODE_SML_INVALID_DATA;
+          }
+        }
         continue;
       }
       if (!isInQuote) {
diff --git a/source/client/test/smlTest.cpp b/source/client/test/smlTest.cpp
index 1578b8b607f8ea19b4ee3efb7573c054b6c379fc..054698fff0bdc542ac31847e2bb70beb4b3e573f 100644
--- a/source/client/test/smlTest.cpp
+++ b/source/client/test/smlTest.cpp
@@ -224,6 +224,8 @@ TEST(testCase, smlParseCols_Error_Test) {
                         "st,tt=aa c 1=2 1626006833639000000,",
                         //field value    double quote,slash
                         "st,tt=aa c=\"a\"a\" 1626006833639000000,",
+                        "escape_test,tag1=\"tag1_value\",tag2=\"tag2_value\" co l0=\"col0_value\",col1=\"col1_value\" 1680918783010000000",
+                        "escape_test,tag1=\"tag1_value\",tag2=\"tag2_value\" col0=\"co\"l\"0_value\",col1=\"col1_value\" 1680918783010000000"
   };
 
   SSmlHandle *info = smlBuildSmlInfo(NULL);