From 3eaae2ab7582b9911145389e481d6bd0f956515d Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Fri, 9 Aug 2024 10:40:38 +0800
Subject: [PATCH] add mem check

---
 source/libs/transport/src/transCli.c | 56 ++++++++++++++--------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c
index 8aea8b7aaa..d8b5cff94b 100644
--- a/source/libs/transport/src/transCli.c
+++ b/source/libs/transport/src/transCli.c
@@ -1164,7 +1164,7 @@ void cliSendBatch(SCliConn* pConn) {
     goto _except;
   }
 
-  int i = 0;
+  int    i = 0;
   queue* h = NULL;
   QUEUE_FOREACH(h, &pBatch->wq) {
     SCliMsg* pCliMsg = QUEUE_DATA(h, SCliMsg, q);
@@ -1215,8 +1215,7 @@ void cliSendBatch(SCliConn* pConn) {
   if (req == NULL) {
     code = TSDB_CODE_OUT_OF_MEMORY;
     tError("%s conn %p failed to send batch msg since:%s", CONN_GET_INST_LABEL(pConn), pConn, tstrerror(code));
-    taosMemoryFree(wb);
-    return;
+    goto _except;
   }
   req->data = pConn;
   tDebug("%s conn %p start to send batch msg, batch size:%d, msgLen:%d", CONN_GET_INST_LABEL(pConn), pConn,
@@ -1225,12 +1224,15 @@ void cliSendBatch(SCliConn* pConn) {
   code = uv_write(req, (uv_stream_t*)pConn->stream, wb, wLen, cliSendBatchCb);
   if (code != 0) {
     tDebug("%s conn %p failed to to send batch msg since %s", CONN_GET_INST_LABEL(pConn), pConn, uv_err_name(code));
+    goto _except;
   }
+
   taosMemoryFree(wb);
   return;
 
 _except:
   cliDestroyBatch(pBatch);
+  taosMemoryFree(wb);
   pConn->pBatch = NULL;
   return;
 }
@@ -2033,33 +2035,31 @@ static void cliBatchDealReq(queue* wq, SCliThrd* pThrd) {
 
           QUEUE_PUSH(&((*ppBatchList)->wq), &pBatch->listq);
           (*ppBatchList)->len += 1;
-
-          continue;
-        }
-
-        queue*     hdr = QUEUE_TAIL(&((*ppBatchList)->wq));
-        SCliBatch* pBatch = QUEUE_DATA(hdr, SCliBatch, listq);
-        if ((pBatch->batchSize + pMsg->msg.contLen) < (*ppBatchList)->batchLenLimit) {
-          QUEUE_PUSH(&pBatch->wq, h);
-          pBatch->batchSize += pMsg->msg.contLen;
-          pBatch->wLen += 1;
         } else {
-          SCliBatch* pBatch = taosMemoryCalloc(1, sizeof(SCliBatch));
-          if (pBatch == NULL) {
-            destroyCmsg(pMsg);
-            continue;
+          queue*     hdr = QUEUE_TAIL(&((*ppBatchList)->wq));
+          SCliBatch* pBatch = QUEUE_DATA(hdr, SCliBatch, listq);
+          if ((pBatch->batchSize + pMsg->msg.contLen) < (*ppBatchList)->batchLenLimit) {
+            QUEUE_PUSH(&pBatch->wq, h);
+            pBatch->batchSize += pMsg->msg.contLen;
+            pBatch->wLen += 1;
+          } else {
+            SCliBatch* pBatch = taosMemoryCalloc(1, sizeof(SCliBatch));
+            if (pBatch == NULL) {
+              destroyCmsg(pMsg);
+              continue;
+            }
+
+            QUEUE_INIT(&pBatch->wq);
+            QUEUE_INIT(&pBatch->listq);
+
+            QUEUE_PUSH(&pBatch->wq, h);
+            pBatch->wLen += 1;
+            pBatch->batchSize += pMsg->msg.contLen;
+            pBatch->pList = *ppBatchList;
+
+            QUEUE_PUSH(&((*ppBatchList)->wq), &pBatch->listq);
+            (*ppBatchList)->len += 1;
           }
-
-          QUEUE_INIT(&pBatch->wq);
-          QUEUE_INIT(&pBatch->listq);
-
-          QUEUE_PUSH(&pBatch->wq, h);
-          pBatch->wLen += 1;
-          pBatch->batchSize += pMsg->msg.contLen;
-          pBatch->pList = *ppBatchList;
-
-          QUEUE_PUSH(&((*ppBatchList)->wq), &pBatch->listq);
-          (*ppBatchList)->len += 1;
         }
       }
       continue;