From 79552ed65d0d7533c48f37ac6312733fc65f11e8 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Sat, 11 Jun 2022 11:35:42 +0800 Subject: [PATCH 1/4] fix(query): add null pointer check. --- source/common/src/tdatablock.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c index 38be0b8f0a..61b79bb1df 100644 --- a/source/common/src/tdatablock.c +++ b/source/common/src/tdatablock.c @@ -1233,6 +1233,10 @@ SSDataBlock* createOneDataBlock(const SSDataBlock* pDataBlock, bool copyData) { SColumnInfoData* pDst = taosArrayGet(pBlock->pDataBlock, i); SColumnInfoData* pSrc = taosArrayGet(pDataBlock->pDataBlock, i); + if (pSrc->pData== NULL) { + continue; + } + int32_t code = colInfoDataEnsureCapacity(pDst, 0, pDataBlock->info.rows); if (code != TSDB_CODE_SUCCESS) { return NULL; From f30ae95b9dcf1f8a6da1618e03424f95792e9326 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Sat, 11 Jun 2022 11:36:13 +0800 Subject: [PATCH 2/4] fix(query): add null pointer check. --- source/common/src/tdatablock.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c index 61b79bb1df..04de2738e1 100644 --- a/source/common/src/tdatablock.c +++ b/source/common/src/tdatablock.c @@ -1233,15 +1233,14 @@ SSDataBlock* createOneDataBlock(const SSDataBlock* pDataBlock, bool copyData) { SColumnInfoData* pDst = taosArrayGet(pBlock->pDataBlock, i); SColumnInfoData* pSrc = taosArrayGet(pDataBlock->pDataBlock, i); - if (pSrc->pData== NULL) { - continue; - } - int32_t code = colInfoDataEnsureCapacity(pDst, 0, pDataBlock->info.rows); if (code != TSDB_CODE_SUCCESS) { return NULL; } + if (pSrc->pData== NULL) { + continue; + } colDataAssign(pDst, pSrc, pDataBlock->info.rows); } From 80b7ba902ced89ecfca85dcffd38793e55040d47 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Sat, 11 Jun 2022 13:48:18 +0800 Subject: [PATCH 3/4] fix(query): add null pointer check. --- source/common/src/tdatablock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c index 04de2738e1..c1f2726629 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) { + if (pSrc->pData== NULL || pDst->pData == NULL) { continue; } colDataAssign(pDst, pSrc, pDataBlock->info.rows); From 94c8ca1e068bc8aa26baa70dce61c29be35fa15b Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Sat, 11 Jun 2022 14:10:00 +0800 Subject: [PATCH 4/4] 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