From a1d143384ab963ec2fa61ef8781b1742a318a8c1 Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Fri, 28 Jan 2022 19:58:56 +0800
Subject: [PATCH] fix mem leak

---
 include/common/common.h                    | 4 ++--
 source/client/src/tmq.c                    | 2 +-
 source/dnode/mnode/impl/src/mndSubscribe.c | 4 ++--
 source/dnode/mnode/impl/src/mndTopic.c     | 7 +++----
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/include/common/common.h b/include/common/common.h
index bad9adedf5..31f905d47f 100644
--- a/include/common/common.h
+++ b/include/common/common.h
@@ -119,7 +119,7 @@ static FORCE_INLINE void* tDecodeDataBlock(void* buf, SSDataBlock* pBlock) {
   buf = taosDecodeFixedI32(buf, &sz);
   pBlock->pDataBlock = taosArrayInit(sz, sizeof(SColumnInfoData));
   for (int32_t i = 0; i < sz; i++) {
-    SColumnInfoData data;
+    SColumnInfoData data = {0};
     buf = taosDecodeFixedI16(buf, &data.info.colId);
     buf = taosDecodeFixedI16(buf, &data.info.type);
     buf = taosDecodeFixedI16(buf, &data.info.bytes);
@@ -167,7 +167,7 @@ static FORCE_INLINE void* tDecodeSMqConsumeRsp(void* buf, SMqConsumeRsp* pRsp) {
   buf = taosDecodeFixedI32(buf, &sz);
   pRsp->pBlockData = taosArrayInit(sz, sizeof(SSDataBlock));
   for (int32_t i = 0; i < sz; i++) {
-    SSDataBlock block;
+    SSDataBlock block = {0};
     tDecodeDataBlock(buf, &block);
     taosArrayPush(pRsp->pBlockData, &block);
   }
diff --git a/source/client/src/tmq.c b/source/client/src/tmq.c
index 26177f466e..421c8fae30 100644
--- a/source/client/src/tmq.c
+++ b/source/client/src/tmq.c
@@ -462,7 +462,7 @@ int32_t tmq_poll_cb_inner(void* param, const SDataBuf* pMsg, int32_t code) {
   char pBuf[128];
   SMqConsumeCbParam* pParam = (SMqConsumeCbParam*)param;
   SMqClientVg* pVg = pParam->pVg;
-  SMqConsumeRsp rsp;
+  SMqConsumeRsp rsp = {0};
   tDecodeSMqConsumeRsp(pMsg->pData, &rsp);
   if (rsp.numOfTopics == 0) {
     /*printf("no data\n");*/
diff --git a/source/dnode/mnode/impl/src/mndSubscribe.c b/source/dnode/mnode/impl/src/mndSubscribe.c
index 8e62d48e61..47bdefea3d 100644
--- a/source/dnode/mnode/impl/src/mndSubscribe.c
+++ b/source/dnode/mnode/impl/src/mndSubscribe.c
@@ -69,7 +69,7 @@ int32_t mndInitSubscribe(SMnode *pMnode) {
 static int32_t mndProcessGetSubEpReq(SMnodeMsg *pMsg) {
   SMnode           *pMnode = pMsg->pMnode;
   SMqCMGetSubEpReq *pReq = (SMqCMGetSubEpReq *)pMsg->rpcMsg.pCont;
-  SMqCMGetSubEpRsp  rsp;
+  SMqCMGetSubEpRsp  rsp = {0};
   int64_t           consumerId = be64toh(pReq->consumerId);
   int64_t           currentTs = taosGetTimestampMs();
 
@@ -134,7 +134,7 @@ static int32_t mndProcessGetSubEpReq(SMnodeMsg *pMsg) {
   }
   void *abuf = buf;
   tEncodeSMqCMGetSubEpRsp(&abuf, &rsp);
-  // TODO: free rsp
+  tDeleteSMqCMGetSubEpRsp(&rsp);
   pMsg->pCont = buf;
   pMsg->contLen = tlen;
   return 0;
diff --git a/source/dnode/mnode/impl/src/mndTopic.c b/source/dnode/mnode/impl/src/mndTopic.c
index 6b4cb4ba59..33def69a68 100644
--- a/source/dnode/mnode/impl/src/mndTopic.c
+++ b/source/dnode/mnode/impl/src/mndTopic.c
@@ -240,15 +240,14 @@ static int32_t mndCreateTopic(SMnode *pMnode, SMnodeMsg *pMsg, SCMCreateTopicReq
   topicObj.uid = mndGenerateUid(pCreate->name, strlen(pCreate->name));
   topicObj.dbUid = pDb->uid;
   topicObj.version = 1;
-  topicObj.sql = strdup(pCreate->sql);
-  topicObj.physicalPlan = strdup(pCreate->physicalPlan);
-  topicObj.logicalPlan = strdup(pCreate->logicalPlan);
+  topicObj.sql = pCreate->sql;
+  topicObj.physicalPlan = pCreate->physicalPlan;
+  topicObj.logicalPlan = pCreate->logicalPlan;
   topicObj.sqlLen = strlen(pCreate->sql);
 
   SSdbRaw *pTopicRaw = mndTopicActionEncode(&topicObj);
   if (pTopicRaw == NULL) return -1;
   if (sdbSetRawStatus(pTopicRaw, SDB_STATUS_READY) != 0) return -1;
-  // TODO: replace with trans to support recovery
   return sdbWrite(pMnode->pSdb, pTopicRaw);
 }
 
-- 
GitLab