From 9ae951621bd1151b09efc42a777fb53ada68721d Mon Sep 17 00:00:00 2001
From: wangjiaming0909 <604227650@qq.com>
Date: Thu, 22 Aug 2024 19:09:25 +0800
Subject: [PATCH] fix error not reported in sort operator

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

diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index 8f97aaf154..8687c98310 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -973,6 +973,9 @@ int32_t blockDataToBuf(char* buf, const SSDataBlock* pBlock) {
 
 int32_t blockDataFromBuf(SSDataBlock* pBlock, const char* buf) {
   int32_t numOfRows = *(int32_t*)buf;
+  if (numOfRows == 0) {
+    return TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR;
+  }
   int32_t code = blockDataEnsureCapacity(pBlock, numOfRows);
   if (code) {
     return code;
diff --git a/source/libs/executor/src/sortoperator.c b/source/libs/executor/src/sortoperator.c
index 36f9ac0954..af8ec299b1 100644
--- a/source/libs/executor/src/sortoperator.c
+++ b/source/libs/executor/src/sortoperator.c
@@ -295,6 +295,9 @@ static int32_t getSortedBlockData(SSortHandle* pHandle, SSDataBlock* pDataBlock,
       break;
     }
   }
+  if (TSDB_CODE_SUCCESS != code) {
+    return code;
+  }
 
   if (p->info.rows > 0) {
     code = blockDataEnsureCapacity(pDataBlock, capacity);