From 5fcff4f730752e3fd182df979cf83e7fa11e3b46 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Fri, 18 Dec 2020 16:06:10 +0800
Subject: [PATCH] TD-2480

---
 src/rpc/src/rpcMain.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/rpc/src/rpcMain.c b/src/rpc/src/rpcMain.c
index 200d189d45..ef201420d2 100644
--- a/src/rpc/src/rpcMain.c
+++ b/src/rpc/src/rpcMain.c
@@ -420,7 +420,12 @@ void rpcSendResponse(const SRpcMsg *pRsp) {
   SRpcMsg   *pMsg = &rpcMsg;
   SRpcInfo  *pRpc = pConn->pRpc;
 
-  if ( pMsg->pCont == NULL ) {
+  if (pConn == NULL) {
+    rpcFreeCont(pMsg->pCont);
+    return;
+  }
+
+  if (pMsg->pCont == NULL) {
     pMsg->pCont = rpcMallocCont(0);
     pMsg->contLen = 0;
   }
@@ -1021,7 +1026,7 @@ static void rpcReportBrokenLinkToServer(SRpcConn *pConn) {
   rpcMsg.pCont = pConn->pReqMsg;     // pReqMsg is re-used to store the APP context from server
   rpcMsg.contLen = pConn->reqMsgLen; // reqMsgLen is re-used to store the APP context length
   rpcMsg.ahandle = pConn->ahandle;
-  rpcMsg.handle = pConn;
+  rpcMsg.handle = NULL;
   rpcMsg.msgType = pConn->inType;
   rpcMsg.code = TSDB_CODE_RPC_NETWORK_UNAVAIL; 
   pConn->pReqMsg = NULL;
-- 
GitLab