From 7fa7be7a8a10a1d36bdc88afca8256e4314036fc Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Fri, 6 Nov 2020 13:28:12 +0800
Subject: [PATCH] TD-1915

---
 src/mnode/src/mnodeInt.c   | 3 +++
 src/mnode/src/mnodeTable.c | 8 +++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/mnode/src/mnodeInt.c b/src/mnode/src/mnodeInt.c
index 98ba9d1e14..d3f2407386 100644
--- a/src/mnode/src/mnodeInt.c
+++ b/src/mnode/src/mnodeInt.c
@@ -61,6 +61,9 @@ int32_t mnodeInitMsg(SMnodeMsg *pMsg) {
 
 void mnodeCleanupMsg(SMnodeMsg *pMsg) {
   if (pMsg != NULL) {
+    if (pMsg->rpcMsg.pCont != pMsg->pCont) {
+      tfree(pMsg->rpcMsg.pCont);
+    }
     if (pMsg->pUser) mnodeDecUserRef(pMsg->pUser);
     if (pMsg->pDb) mnodeDecDbRef(pMsg->pDb);
     if (pMsg->pVgroup) mnodeDecVgroupRef(pMsg->pVgroup);
diff --git a/src/mnode/src/mnodeTable.c b/src/mnode/src/mnodeTable.c
index e3a0b38d7c..d27688f8a9 100644
--- a/src/mnode/src/mnodeTable.c
+++ b/src/mnode/src/mnodeTable.c
@@ -2156,7 +2156,7 @@ static int32_t mnodeAutoCreateChildTable(SMnodeMsg *pMsg) {
   }
 
   int32_t contLen = sizeof(SCMCreateTableMsg) + offsetof(STagData, data) + tagLen;
-  SCMCreateTableMsg *pCreateMsg = rpcMallocCont(contLen);
+  SCMCreateTableMsg *pCreateMsg = calloc(1, contLen);
   if (pCreateMsg == NULL) {
     mError("app:%p:%p, table:%s, failed to create table while get meta info, no enough memory", pMsg->rpcMsg.ahandle,
            pMsg, pInfo->tableId);
@@ -2174,11 +2174,13 @@ static int32_t mnodeAutoCreateChildTable(SMnodeMsg *pMsg) {
   mDebug("app:%p:%p, table:%s, start to create on demand, tagLen:%d stable:%s",
          pMsg->rpcMsg.ahandle, pMsg, pInfo->tableId, tagLen, pTags->name);
 
-  rpcFreeCont(pMsg->rpcMsg.pCont);
+  if (pMsg->rpcMsg.pCont != pMsg->pCont) {
+    tfree(pMsg->rpcMsg.pCont);
+  }
   pMsg->rpcMsg.msgType = TSDB_MSG_TYPE_CM_CREATE_TABLE;
   pMsg->rpcMsg.pCont = pCreateMsg;
   pMsg->rpcMsg.contLen = contLen;
-  
+
   return TSDB_CODE_MND_ACTION_NEED_REPROCESSED;
 }
 
-- 
GitLab