From 3bbf5405c6f9d80521c76b065166be765d0ed435 Mon Sep 17 00:00:00 2001
From: kailixu <klxu@taosdata.com>
Date: Mon, 29 May 2023 14:36:29 +0800
Subject: [PATCH] fix(query): invalid buf page

---
 source/libs/executor/inc/executil.h | 3 +++
 source/util/src/tpagedbuf.c         | 1 +
 2 files changed, 4 insertions(+)

diff --git a/source/libs/executor/inc/executil.h b/source/libs/executor/inc/executil.h
index 5b248f9a90..0f169b0c2e 100644
--- a/source/libs/executor/inc/executil.h
+++ b/source/libs/executor/inc/executil.h
@@ -135,6 +135,9 @@ struct SResultRowEntryInfo* getResultEntryInfo(const SResultRow* pRow, int32_t i
 
 static FORCE_INLINE SResultRow* getResultRowByPos(SDiskbasedBuf* pBuf, SResultRowPosition* pos, bool forUpdate) {
   SFilePage* bufPage = (SFilePage*)getBufPage(pBuf, pos->pageId);
+  if (!bufPage) {
+    return NULL;
+  }
   if (forUpdate) {
     setBufPageDirty(bufPage, true);
   }
diff --git a/source/util/src/tpagedbuf.c b/source/util/src/tpagedbuf.c
index fa8b5d33b7..218a47ea62 100644
--- a/source/util/src/tpagedbuf.c
+++ b/source/util/src/tpagedbuf.c
@@ -482,6 +482,7 @@ void* getBufPage(SDiskbasedBuf* pBuf, int32_t id) {
 
     SPageInfo** pInfo = (SPageInfo**)((*pi)->pn->data);
     if (*pInfo != *pi) {
+      terrno = TSDB_CODE_QRY_SYS_ERROR;
       uError("inconsistently data in paged buffer, pInfo:%p, pi:%p, %s", *pInfo, *pi, pBuf->id);
       return NULL;
     }
-- 
GitLab