From 52173e14e1b753f4a530f205f05024b01e89ff55 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Fri, 5 Aug 2022 16:10:45 +0800
Subject: [PATCH] fix(query): add check for null ptr.

---
 source/dnode/vnode/src/tsdb/tsdbRead.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/source/dnode/vnode/src/tsdb/tsdbRead.c b/source/dnode/vnode/src/tsdb/tsdbRead.c
index 2a8e234ac0..0749d7b133 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead.c
@@ -2312,6 +2312,12 @@ void doMergeMultiRows(TSDBROW* pRow, uint64_t uid, SIterInfo* pIter, SArray* pDe
       return;
     } else {  // has next point in mem/imem
       TSDBROW* pNextRow = getValidRow(pIter, pDelList, pReader);
+      if (pNextRow == NULL) {
+        *pTSRow = current.pTSRow;
+        *freeTSRow = false;
+        return;
+      }
+
       if (TSDBROW_KEY(&current).ts != TSDBROW_KEY(pNextRow).ts) {
         *pTSRow = current.pTSRow;
         *freeTSRow = false;