Merge pull request #18439 from taosdata/fix/TD-20651

fix: fix invalid packet

source/libs/transport/src/transCli.c

@@ -794,15 +794,18 @@ void cliSend(SCliConn* pConn) {
   int            msgLen = transMsgLenFromCont(pMsg->contLen);
   STransMsgHead* pHead = transHeadFromCont(pMsg->pCont);
 
-  pHead->ahandle = pCtx != NULL ? (uint64_t)pCtx->ahandle : 0;
-  pHead->noResp = REQUEST_NO_RESP(pMsg) ? 1 : 0;
-  pHead->persist = REQUEST_PERSIS_HANDLE(pMsg) ? 1 : 0;
-  pHead->msgType = pMsg->msgType;
-  pHead->msgLen = (int32_t)htonl((uint32_t)msgLen);
-  pHead->release = REQUEST_RELEASE_HANDLE(pCliMsg) ? 1 : 0;
-  memcpy(pHead->user, pTransInst->user, strlen(pTransInst->user));
-  pHead->traceId = pMsg->info.traceId;
-  pHead->magicNum = htonl(TRANS_MAGIC_NUM);
+  if (pHead->comp == 0) {
+    pHead->ahandle = pCtx != NULL ? (uint64_t)pCtx->ahandle : 0;
+    pHead->noResp = REQUEST_NO_RESP(pMsg) ? 1 : 0;
+    pHead->persist = REQUEST_PERSIS_HANDLE(pMsg) ? 1 : 0;
+    pHead->msgType = pMsg->msgType;
+    pHead->msgLen = (int32_t)htonl((uint32_t)msgLen);
+    pHead->release = REQUEST_RELEASE_HANDLE(pCliMsg) ? 1 : 0;
+    memcpy(pHead->user, pTransInst->user, strlen(pTransInst->user));
+    pHead->traceId = pMsg->info.traceId;
+    pHead->magicNum = htonl(TRANS_MAGIC_NUM);
+  }
+
   if (pHead->persist == 1) {
     CONN_SET_PERSIST_BY_APP(pConn);
   }

source/libs/transport/src/transComm.c

@@ -60,21 +60,20 @@ int32_t transDecompressMsg(char** msg, int32_t len) {
   STransMsgHead* pHead = (STransMsgHead*)(*msg);
   if (pHead->comp == 0) return 0;
 
-  char*          pCont = transContFromHead(pHead);
+  char* pCont = transContFromHead(pHead);
+
   STransCompMsg* pComp = (STransCompMsg*)pCont;
   int32_t        oriLen = htonl(pComp->contLen);
 
   char*          buf = taosMemoryCalloc(1, oriLen + sizeof(STransMsgHead));
   STransMsgHead* pNewHead = (STransMsgHead*)buf;
-
-  int32_t decompLen = LZ4_decompress_safe(pCont + sizeof(STransCompMsg), pNewHead->content,
-                                          len - sizeof(STransMsgHead) - sizeof(STransCompMsg), oriLen);
+  int32_t        decompLen = LZ4_decompress_safe(pCont + sizeof(STransCompMsg), pNewHead->content,
+                                                 len - sizeof(STransMsgHead) - sizeof(STransCompMsg), oriLen);
   memcpy((char*)pNewHead, (char*)pHead, sizeof(STransMsgHead));
 
   pNewHead->msgLen = htonl(oriLen + sizeof(STransMsgHead));
 
   taosMemoryFree(pHead);
-
   *msg = buf;
   if (decompLen != oriLen) {
     return -1;