From a641a07085b2e228e363a312f31899e7e8e9dc24 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Tue, 4 Jul 2023 11:13:03 +0800
Subject: [PATCH] fix:[TD-25071] pSub is null & return wal not exist if no data

---
 source/dnode/mnode/impl/src/mndConsumer.c | 3 +++
 source/libs/wal/src/walRead.c             | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/source/dnode/mnode/impl/src/mndConsumer.c b/source/dnode/mnode/impl/src/mndConsumer.c
index 47cc4a1ce7..bdf9931ca2 100644
--- a/source/dnode/mnode/impl/src/mndConsumer.c
+++ b/source/dnode/mnode/impl/src/mndConsumer.c
@@ -419,6 +419,9 @@ static int32_t mndProcessMqHbReq(SRpcMsg *pMsg) {
     mDebug("heartbeat report offset rows.%s:%s", pConsumer->cgroup, data->topicName);
 
     SMqSubscribeObj *pSub = mndAcquireSubscribe(pMnode, pConsumer->cgroup, data->topicName);
+    if(pSub == NULL){
+      continue;
+    }
     taosWLockLatch(&pSub->lock);
     SMqConsumerEp *pConsumerEp = taosHashGet(pSub->consumerHash, &consumerId, sizeof(int64_t));
     if(pConsumerEp){
diff --git a/source/libs/wal/src/walRead.c b/source/libs/wal/src/walRead.c
index 1223e3756c..786f48ce88 100644
--- a/source/libs/wal/src/walRead.c
+++ b/source/libs/wal/src/walRead.c
@@ -82,6 +82,11 @@ int32_t walNextValidMsg(SWalReader *pReader) {
          ", applied index:%" PRId64", end index:%" PRId64,
          pReader->pWal->cfg.vgId, fetchVer, lastVer, committedVer, appliedVer, endVer);
 
+  if (fetchVer > endVer){
+    terrno = TSDB_CODE_WAL_LOG_NOT_EXIST;
+    return -1;
+  }
+
   while (fetchVer <= endVer) {
     if (walFetchHeadNew(pReader, fetchVer) < 0) {
       return -1;