xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix bug #657. RPC module frees the msg body while other threads still access that struct to cause the SIGSEGV error.

This commit is contained in:
hjxilinx 2019-10-29 17:53:19 +08:00
parent 9c468129d2
commit 6fec7de230
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/rpc/src/trpc.c
View File

@ -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);
}
}