From 6851a7db0441e7231308731098b3b450b73ef619 Mon Sep 17 00:00:00 2001
From: kailixu <klxu@taosdata.com>
Date: Fri, 13 Jan 2023 02:12:04 +0800
Subject: [PATCH] fix: memory leak

---
 source/common/src/tmsg.c                  |  2 +-
 source/dnode/vnode/src/sma/smaTimeRange.c | 36 +++++++++++------------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c
index 83f447fd0e..2c4fc98750 100644
--- a/source/common/src/tmsg.c
+++ b/source/common/src/tmsg.c
@@ -3001,7 +3001,7 @@ int32_t tSerializeSTableIndexRsp(void *buf, int32_t bufLen, const STableIndexRsp
 
 void tFreeSerializeSTableIndexRsp(STableIndexRsp *pRsp) {
   if (pRsp->pIndex != NULL) {
-    taosArrayDestroy(pRsp->pIndex);
+    tFreeSTableIndexRsp(pRsp);
     pRsp->pIndex = NULL;
   }
 }
diff --git a/source/dnode/vnode/src/sma/smaTimeRange.c b/source/dnode/vnode/src/sma/smaTimeRange.c
index 2702d11949..1b191dd5a5 100644
--- a/source/dnode/vnode/src/sma/smaTimeRange.c
+++ b/source/dnode/vnode/src/sma/smaTimeRange.c
@@ -256,28 +256,23 @@ int32_t smaBlockToSubmit(SVnode *pVnode, const SArray *pBlocks, const STSchema *
 
     int32_t rows = pDataBlock->info.rows;
 
-    SSubmitTbData *pTbData = (SSubmitTbData *)taosMemoryCalloc(1, sizeof(SSubmitTbData));
-    if (!pTbData) {
-      terrno = TSDB_CODE_OUT_OF_MEMORY;
-      goto _end;
-    }
+    SSubmitTbData tbData = {0};
+    
 
-    if (!(pTbData->aRowP = taosArrayInit(rows, sizeof(SRow *)))) {
-      taosMemoryFree(pTbData);
+    if (!(tbData.aRowP = taosArrayInit(rows, sizeof(SRow *)))) {
       goto _end;
     }
-    pTbData->suid = suid;
-    pTbData->uid = 0;  // uid is assigned by vnode
-    pTbData->sver = pTSchema->version;
+    tbData.suid = suid;
+    tbData.uid = 0;  // uid is assigned by vnode
+    tbData.sver = pTSchema->version;
 
     if (createTb) {
-      pTbData->pCreateTbReq = taosArrayGetP(createTbArray, i);
-      if (pTbData->pCreateTbReq) pTbData->flags = SUBMIT_REQ_AUTO_CREATE_TABLE;
+      tbData.pCreateTbReq = taosArrayGetP(createTbArray, i);
+      if (tbData.pCreateTbReq) tbData.flags = SUBMIT_REQ_AUTO_CREATE_TABLE;
     }
 
     if (!pVals && !(pVals = taosArrayInit(pTSchema->numOfCols, sizeof(SColVal)))) {
-      taosArrayDestroy(pTbData->aRowP);
-      taosMemoryFree(pTbData);
+      taosArrayDestroy(tbData.aRowP);
       goto _end;
     }
 
@@ -305,14 +300,13 @@ int32_t smaBlockToSubmit(SVnode *pVnode, const SArray *pBlocks, const STSchema *
       }
       SRow *pRow = NULL;
       if ((terrno = tRowBuild(pVals, (STSchema *)pTSchema, &pRow)) < 0) {
-        tDestroySSubmitTbData(pTbData, TSDB_MSG_FLG_ENCODE);
+        tDestroySSubmitTbData(&tbData, TSDB_MSG_FLG_ENCODE);
         goto _end;
       }
-      ASSERT(pRow);
-      taosArrayPush(pTbData->aRowP, &pRow);
+      taosArrayPush(tbData.aRowP, &pRow);
     }
 
-    taosArrayPush(pReq->aSubmitTbData, pTbData);
+    taosArrayPush(pReq->aSubmitTbData, &tbData);
   }
 
   // encode
@@ -334,9 +328,13 @@ int32_t smaBlockToSubmit(SVnode *pVnode, const SArray *pBlocks, const STSchema *
     tEncoderClear(&encoder);
   }
 _end:
+  taosArrayDestroy(createTbArray);
   taosArrayDestroy(tagArray);
   taosArrayDestroy(pVals);
-  tDestroySSubmitReq2(pReq, TSDB_MSG_FLG_ENCODE);
+  if (pReq) {
+    tDestroySSubmitReq2(pReq, TSDB_MSG_FLG_ENCODE);
+    taosMemoryFree(pReq);
+  }
 
   if (terrno != 0) {
     rpcFreeCont(pBuf);