From 087f88a617976744ca6270b2221391df906d67f2 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Tue, 3 Jan 2023 18:18:46 +0800
Subject: [PATCH] fix:malloc too large

---
 source/client/src/clientSml.c     | 1 +
 source/client/src/clientSmlJson.c | 9 +++++----
 utils/test/c/sml_test.c           | 3 +--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/source/client/src/clientSml.c b/source/client/src/clientSml.c
index ca6395b52b..71349e61ec 100644
--- a/source/client/src/clientSml.c
+++ b/source/client/src/clientSml.c
@@ -1067,6 +1067,7 @@ void smlDestroyInfo(SSmlHandle *info) {
     taosMemoryFree(info->lines);
   }
 
+  cJSON_Delete(info->root);
   taosMemoryFreeClear(info);
 }
 
diff --git a/source/client/src/clientSmlJson.c b/source/client/src/clientSmlJson.c
index 60e29638f5..27175420a9 100644
--- a/source/client/src/clientSmlJson.c
+++ b/source/client/src/clientSmlJson.c
@@ -335,6 +335,9 @@ int smlJsonParseObjFirst(char **start, SSmlLineInfo *element, int8_t *offset){
         (*start)++;
       }
     }
+    if(*(*start) == '\0'){
+      break;
+    }
     if(*(*start) == '}'){
       (*start)++;
       break;
@@ -923,9 +926,6 @@ static int32_t smlParseJSONStringExt(SSmlHandle *info, cJSON *root, SSmlLineInfo
   cJSON *tsJson = NULL;
   cJSON *valueJson = NULL;
   cJSON *tagsJson = NULL;
-  char* rootStr = cJSON_PrintUnformatted(root);
-  uError("rootStr:%s", rootStr);
-  taosMemoryFree(rootStr);
 
   int32_t size = cJSON_GetArraySize(root);
   // outmost json fields has to be exactly 4
@@ -956,6 +956,7 @@ static int32_t smlParseJSONStringExt(SSmlHandle *info, cJSON *root, SSmlLineInfo
   }
 
   // Parse tags
+  bool needFree = info->dataFormat;
   elements->tags = cJSON_PrintUnformatted(tagsJson);
   elements->tagsLen = strlen(elements->tags);
   if(is_same_child_table_telnet(elements, &info->preLine) != 0) {
@@ -968,7 +969,7 @@ static int32_t smlParseJSONStringExt(SSmlHandle *info, cJSON *root, SSmlLineInfo
     }
   }
 
-  if(info->dataFormat){
+  if(needFree){
     taosMemoryFree(elements->tags);
     elements->tags = NULL;
   }
diff --git a/utils/test/c/sml_test.c b/utils/test/c/sml_test.c
index 30d0ab27d8..d592184836 100644
--- a/utils/test/c/sml_test.c
+++ b/utils/test/c/sml_test.c
@@ -211,8 +211,7 @@ int smlProcess_json3_Test() {
   taos_free_result(pRes);
 
   const char *sql[] = {
-//      "[{\"metric\":\"sys.cpu.nice3\",\"timestamp\":0,\"value\":\"18\",\"tags\":{\"host\":\"web01\",\"id\":\"t1\",\"dc\":\"lga\"}}]"
-        "{\"metric\": \"dcxnmr\", \"timestamp\": {\"value\": 1626006833639000000, \"type\": \"ns\"}, \"value\": {\"value\": false, \"type\": \"bool\"}, \"tags\": {\"t0\": {\"value\": false, \"type\": \"bool\"}, \"t1\": {\"value\": 127, \"type\": \"tinyint\"}, \"t2\": {\"value\": 32767, \"type\": \"smallint\"}, \"t3\": {\"value\": 2147483647, \"type\": \"int\"}, \"t4\": {\"value\": 9223372036854775807, \"type\": \"bigint\"}, \"t5\": {\"value\": 11.12345027923584, \"type\": \"float\"}, \"t6\": {\"value\": 22.123456789, \"type\": \"double\"}, \"t7\": {\"value\": \"binaryTagValue\", \"type\": \"binary\"}, \"t8\": {\"value\": \"abc{aaa\", \"type\": \"nchar\"}}}"
+      "[{\"metric\":\"sys.cpu.nice3\",\"timestamp\":0,\"value\":\"18\",\"tags\":{\"host\":\"web01\",\"id\":\"t1\",\"dc\":\"lga\"}}]"
   };
   char *sql1[1] = {0};
   for(int i = 0; i < 1; i++){
-- 
GitLab