From 8c22eed1bbfe2f0317c63be88ef0420087ba422e Mon Sep 17 00:00:00 2001
From: Jeff Tao <jianhui.tao@qq.com>
Date: Sun, 12 Apr 2020 18:10:06 +0800
Subject: [PATCH] remove a potential race condition

---
 src/rpc/src/rpcClient.c | 26 ++++++++++++--------------
 src/rpc/test/rclient.c  |  2 ++
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/rpc/src/rpcClient.c b/src/rpc/src/rpcClient.c
index 264449bbb0..a3105ef516 100644
--- a/src/rpc/src/rpcClient.c
+++ b/src/rpc/src/rpcClient.c
@@ -188,10 +188,19 @@ static void taosCleanUpTcpFdObj(STcpFd *pFdObj) {
   if (pFdObj == NULL) return;
   if (pFdObj->signature != pFdObj) return;
 
+  pFdObj->signature = NULL;
   pTcp = pFdObj->pTcp;
-  if (pTcp == NULL) {
-    tError("double free TcpFdObj!!!!");
-    return;
+
+  if (pFdObj->thandle) {
+    recvInfo.msg = NULL;
+    recvInfo.msgLen = 0;
+    recvInfo.ip = 0;
+    recvInfo.port = 0;
+    recvInfo.shandle = pTcp->shandle;
+    recvInfo.thandle = pFdObj->thandle;;
+    recvInfo.chandle = NULL;
+    recvInfo.connType = RPC_CONN_TCP;
+    (*(pTcp->processData))(&recvInfo);
   }
 
   epoll_ctl(pTcp->pollFd, EPOLL_CTL_DEL, pFdObj->fd, NULL);
@@ -216,19 +225,8 @@ static void taosCleanUpTcpFdObj(STcpFd *pFdObj) {
 
   pthread_mutex_unlock(&pTcp->mutex);
 
-  recvInfo.msg = NULL;
-  recvInfo.msgLen = 0;
-  recvInfo.ip = 0;
-  recvInfo.port = 0;
-  recvInfo.shandle = pTcp->shandle;
-  recvInfo.thandle = pFdObj->thandle;;
-  recvInfo.chandle = NULL;
-  recvInfo.connType = RPC_CONN_TCP;
-
-  if (pFdObj->thandle) (*(pTcp->processData))(&recvInfo);
   tTrace("%s TCP is cleaned up, FD:%p numOfFds:%d", pTcp->label, pFdObj, pTcp->numOfFds);
 
-  memset(pFdObj, 0, sizeof(STcpFd));
   tfree(pFdObj);
 }
 
diff --git a/src/rpc/test/rclient.c b/src/rpc/test/rclient.c
index f000ab91a2..732d7eb81c 100644
--- a/src/rpc/test/rclient.c
+++ b/src/rpc/test/rclient.c
@@ -204,6 +204,8 @@ int main(int argc, char *argv[]) {
   tPrint("it takes %.3f mseconds to send %d requests to server", usedTime, numOfReqs*appThreads);
   tPrint("Performance: %.3f requests per second, msgSize:%d bytes", 1000.0*numOfReqs*appThreads/usedTime, msgSize);
 
+  getchar();
+
   taosCloseLogger();
 
   return 0;
-- 
GitLab