From 94c8ca1e068bc8aa26baa70dce61c29be35fa15b Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sat, 11 Jun 2022 14:10:00 +0800
Subject: [PATCH] fix(query): add null pointer check.

---
 source/common/src/tdatablock.c          | 2 +-
 source/libs/executor/src/executorimpl.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index c1f2726629..5b71578190 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -1238,7 +1238,7 @@ SSDataBlock* createOneDataBlock(const SSDataBlock* pDataBlock, bool copyData) {
         return NULL;
       }
 
-      if (pSrc->pData== NULL || pDst->pData == NULL) {
+      if (pSrc->pData == NULL) {
         continue;
       }
       colDataAssign(pDst, pSrc, pDataBlock->info.rows);
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index eda24cb0d6..516824a446 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -1857,7 +1857,7 @@ void extractQualifiedTupleByFilterResult(SSDataBlock* pBlock, const int8_t* rowR
       SColumnInfoData* pSrc = taosArrayGet(px->pDataBlock, i);
       SColumnInfoData* pDst = taosArrayGet(pBlock->pDataBlock, i);
       // it is a reserved column for scalar function, and no data in this column yet.
-      if (pSrc->pData == NULL) {
+      if (pDst->pData == NULL) {
         continue;
       }
 
@@ -1882,10 +1882,8 @@ void extractQualifiedTupleByFilterResult(SSDataBlock* pBlock, const int8_t* rowR
       } else {
         ASSERT(pBlock->info.rows == numOfRows);
       }
-
-      // write back
-//      colDataAssign(pSrc, pDst, pBlock->info.rows);
     }
+
     blockDataDestroy(px);  // fix memory leak
   } else {
     // do nothing