From 03c19aa887676bfd4a81ab69ac7c904c23f4cee6 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Mon, 24 Jan 2022 06:44:19 +0000
Subject: [PATCH] fix memory leak

---
 source/dnode/vnode/src/meta/metaBDBImpl.c     |  3 ++-
 source/dnode/vnode/src/tq/tq.c                |  3 +++
 source/dnode/vnode/src/vnd/vnodeArenaMAImpl.c |  1 -
 source/dnode/vnode/src/vnd/vnodeQuery.c       | 19 +++++++++++++++----
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/source/dnode/vnode/src/meta/metaBDBImpl.c b/source/dnode/vnode/src/meta/metaBDBImpl.c
index b9f7649913..c8c5759bd2 100644
--- a/source/dnode/vnode/src/meta/metaBDBImpl.c
+++ b/source/dnode/vnode/src/meta/metaBDBImpl.c
@@ -587,9 +587,10 @@ char *metaTbCursorNext(SMTbCursor *pTbCur) {
       pBuf = value.data;
       metaDecodeTbInfo(pBuf, &tbCfg);
       if (tbCfg.type == META_SUPER_TABLE) {
+        free(tbCfg.stbCfg.pTagSchema);
         continue;
       } else if (tbCfg.type == META_CHILD_TABLE) {
-        kvRowFree(tbCfg.ctbCfg.pTag)
+        kvRowFree(tbCfg.ctbCfg.pTag);
       }
       return tbCfg.name;
     } else {
diff --git a/source/dnode/vnode/src/tq/tq.c b/source/dnode/vnode/src/tq/tq.c
index 49bbb77797..243b8d1b66 100644
--- a/source/dnode/vnode/src/tq/tq.c
+++ b/source/dnode/vnode/src/tq/tq.c
@@ -81,6 +81,9 @@ STQ* tqOpen(const char* path, SWal* pWal, SMeta* pMeta, STqCfg* tqConfig, SMemAl
 }
 
 void tqClose(STQ* pTq) {
+  if (pTq) {
+    free(pTq);
+  }
   // TODO
 }
 
diff --git a/source/dnode/vnode/src/vnd/vnodeArenaMAImpl.c b/source/dnode/vnode/src/vnd/vnodeArenaMAImpl.c
index 5844ef0345..a2e3a0dc56 100644
--- a/source/dnode/vnode/src/vnd/vnodeArenaMAImpl.c
+++ b/source/dnode/vnode/src/vnd/vnodeArenaMAImpl.c
@@ -114,4 +114,3 @@ static void vArenaNodeFree(SVArenaNode *pNode) {
   if (pNode) {
     free(pNode);
   }
-}
\ No newline at end of file
diff --git a/source/dnode/vnode/src/vnd/vnodeQuery.c b/source/dnode/vnode/src/vnd/vnodeQuery.c
index 436dbab357..be30df6e3c 100644
--- a/source/dnode/vnode/src/vnd/vnodeQuery.c
+++ b/source/dnode/vnode/src/vnd/vnodeQuery.c
@@ -145,9 +145,15 @@ static int vnodeGetTableMeta(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp) {
 
 _exit:
 
+  free(pSW->pSchema);
   free(pSW);
   free(pTbCfg->name);
   free(pTbCfg);
+  if (pTbCfg->type == META_SUPER_TABLE) {
+    free(pTbCfg->stbCfg.pTagSchema);
+  } else if (pTbCfg->type == META_SUPER_TABLE) {
+    kvRowFree(pTbCfg->ctbCfg.pTag);
+  }
   rpcMsg.handle = pMsg->handle;
   rpcMsg.ahandle = pMsg->ahandle;
   rpcMsg.pCont = pTbMetaMsg;
@@ -159,8 +165,8 @@ _exit:
   return 0;
 }
 
-static void freeItemHelper(void* pItem) {
-  char* p = *(char**)pItem;
+static void freeItemHelper(void *pItem) {
+  char *p = *(char **)pItem;
   free(p);
 }
 
@@ -190,14 +196,14 @@ static int32_t vnodeGetTableList(SVnode *pVnode, SRpcMsg *pMsg) {
   // TODO: temp debug, and should del when show tables command ok
   vInfo("====vgId:%d, numOfTables: %d", pVnode->vgId, numOfTables);
   if (numOfTables > 10000) {
-     numOfTables = 10000;
+    numOfTables = 10000;
   }
 
   metaCloseTbCursor(pCur);
 
   int32_t rowLen =
       (TSDB_TABLE_NAME_LEN + VARSTR_HEADER_SIZE) + 8 + 2 + (TSDB_TABLE_NAME_LEN + VARSTR_HEADER_SIZE) + 8 + 4;
-  //int32_t numOfTables = (int32_t)taosArrayGetSize(pArray);
+  // int32_t numOfTables = (int32_t)taosArrayGetSize(pArray);
 
   int32_t payloadLen = rowLen * numOfTables;
   //  SVShowTablesFetchReq *pFetchReq = pMsg->pCont;
@@ -225,6 +231,11 @@ static int32_t vnodeGetTableList(SVnode *pVnode, SRpcMsg *pMsg) {
   };
 
   rpcSendResponse(&rpcMsg);
+  for (int i = 0; i < taosArrayGetSize(pArray); i++) {
+    name = *(char **)taosArrayGet(pArray, i);
+    free(name);
+  }
+
   taosArrayDestroyEx(pArray, freeItemHelper);
   return 0;
 }