From 6fec7de23087b2eb8b9db84e9e53bfddaf31b9d4 Mon Sep 17 00:00:00 2001
From: hjxilinx <hjxilinx@163.com>
Date: Tue, 29 Oct 2019 17:53:19 +0800
Subject: [PATCH] fix bug #657. RPC module frees the msg body while other
 threads still access that struct to cause the SIGSEGV error.

---
 src/rpc/src/trpc.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/rpc/src/trpc.c b/src/rpc/src/trpc.c
index 2c009343ae..32e9a42a38 100644
--- a/src/rpc/src/trpc.c
+++ b/src/rpc/src/trpc.c
@@ -1108,6 +1108,7 @@ int taosSendMsgToPeerH(void *thandle, char *pCont, int contLen, void *ahandle) {
   SRpcConn *   pConn = (SRpcConn *)thandle;
   STaosRpc *   pServer;
   SRpcChann *  pChann;
+  uint8_t      msgType;
 
   if (pConn == NULL) return -1;
   if (pConn->signature != pConn) return -1;
@@ -1133,8 +1134,9 @@ int taosSendMsgToPeerH(void *thandle, char *pCont, int contLen, void *ahandle) {
   }
 
   pthread_mutex_lock(&pChann->mutex);
+  msgType = pHeader->msgType;
 
-  if ((pHeader->msgType & 1) == 0) {
+  if ((msgType & 1) == 0) {
     // response
     pConn->inType = 0;
     tfree(pConn->pRspMsg);
@@ -1160,7 +1162,7 @@ int taosSendMsgToPeerH(void *thandle, char *pCont, int contLen, void *ahandle) {
       }
 
       tTrace("%s cid:%d sid:%d id:%s, msg:%s is put into queue pConn:%p", pServer->label, pConn->chann, pConn->sid,
-             pConn->meterId, taosMsg[pHeader->msgType], pConn);
+             pConn->meterId, taosMsg[msgType], pConn);
       msgLen = 0;
 
     } else {
@@ -1170,7 +1172,7 @@ int taosSendMsgToPeerH(void *thandle, char *pCont, int contLen, void *ahandle) {
                pServer->label, pConn->chann, pConn->sid, pConn->meterId, pConn);
       }
 
-      pConn->outType = pHeader->msgType;
+      pConn->outType = msgType;
       pConn->outTranId = pHeader->tranId;
       pConn->pMsgNode = pMsgNode;
       pConn->rspReceived = 0;
@@ -1182,7 +1184,7 @@ int taosSendMsgToPeerH(void *thandle, char *pCont, int contLen, void *ahandle) {
 
   if (msgLen) {
     taosSendDataToPeer(pConn, (char *)pHeader, msgLen);
-    if (pHeader->msgType & 1) {
+    if (msgType & 1U) {
       taosTmrReset(taosProcessTaosTimer, tsRpcTimer, pConn, pChann->tmrCtrl, &pConn->pTimer);
     }
   }
-- 
GitLab