From e53c8a35a44ef368e07e78e07b3eab747cf77e00 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Wed, 24 Jul 2024 18:19:51 +0800
Subject: [PATCH] fix:[TD-31017]process return value in vnode for tmq

---
 source/dnode/vnode/src/tq/tq.c     | 11 +++++++----
 source/dnode/vnode/src/tq/tqMeta.c |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/source/dnode/vnode/src/tq/tq.c b/source/dnode/vnode/src/tq/tq.c
index c883a9d9dc..0ab420ce63 100644
--- a/source/dnode/vnode/src/tq/tq.c
+++ b/source/dnode/vnode/src/tq/tq.c
@@ -336,7 +336,7 @@ int32_t tqProcessPollPush(STQ* pTq, SRpcMsg* pMsg) {
                        .pCont = pHandle->msg->pCont,
                        .contLen = pHandle->msg->contLen,
                        .info = pHandle->msg->info};
-        tmsgPutToQueue(&pTq->pVnode->msgCb, QUERY_QUEUE, &msg);
+        (void)tmsgPutToQueue(&pTq->pVnode->msgCb, QUERY_QUEUE, &msg);
         taosMemoryFree(pHandle->msg);
         pHandle->msg = NULL;
       }
@@ -451,8 +451,7 @@ int32_t tqProcessVgCommittedInfoReq(STQ* pTq, SRpcMsg* pMsg) {
 
   tEncodeSize(tEncodeMqVgOffset, &vgOffset, len, code);
   if (code < 0) {
-    terrno = TSDB_CODE_INVALID_PARA;
-    return terrno;
+    return TAOS_GET_TERRNO(TSDB_CODE_INVALID_PARA);
   }
 
   void* buf = rpcMallocCont(len);
@@ -462,8 +461,12 @@ int32_t tqProcessVgCommittedInfoReq(STQ* pTq, SRpcMsg* pMsg) {
   }
   SEncoder encoder;
   tEncoderInit(&encoder, buf, len);
-  tEncodeMqVgOffset(&encoder, &vgOffset);
+  code = tEncodeMqVgOffset(&encoder, &vgOffset);
   tEncoderClear(&encoder);
+  if (code < 0) {
+    rpcFreeCont(buf);
+    return TAOS_GET_TERRNO(TSDB_CODE_INVALID_PARA);
+  }
 
   SRpcMsg rsp = {.info = pMsg->info, .pCont = buf, .contLen = len, .code = 0};
 
diff --git a/source/dnode/vnode/src/tq/tqMeta.c b/source/dnode/vnode/src/tq/tqMeta.c
index f78084352d..9e90c1cd59 100644
--- a/source/dnode/vnode/src/tq/tqMeta.c
+++ b/source/dnode/vnode/src/tq/tqMeta.c
@@ -415,7 +415,7 @@ static int32_t tqMetaRestoreCheckInfo(STQ* pTq) {
 END:
   tdbFree(pKey);
   tdbFree(pVal);
-  tdbTbcClose(pCur);
+  (void)tdbTbcClose(pCur);
   tDeleteSTqCheckInfo(&info);
   return code;
 }