diff --git a/source/libs/executor/src/tsort.c b/source/libs/executor/src/tsort.c
index 205cd7d3ef..ee1d831a24 100644
--- a/source/libs/executor/src/tsort.c
+++ b/source/libs/executor/src/tsort.c
@@ -878,6 +878,9 @@ static int32_t blockCompareTsFn(const void* pLeft, const void* pRight, void* par
 static int32_t appendDataBlockToPageBuf(SSortHandle* pHandle, SSDataBlock* blk, SArray* aPgId) {
   int32_t pageId = -1;
   void*   pPage = getNewBufPage(pHandle->pBuf, &pageId);
+  if (pPage == NULL) {
+    return terrno;
+  }
   taosArrayPush(aPgId, &pageId);
 
   int32_t size = blockDataGetSize(blk) + sizeof(int32_t) + taosArrayGetSize(blk->pDataBlock) * sizeof(int32_t);
@@ -944,16 +947,15 @@ static int32_t sortBlocksToExtSource(SSortHandle* pHandle, SArray* aBlk, SBlockO
     totalRows += blk->info.rows;
   }
 
-  SArray* aPgId = taosArrayInit(8, sizeof(int32_t));
-
   SMultiwayMergeTreeInfo* pTree = NULL;        
   code = tMergeTreeCreate(&pTree, taosArrayGetSize(aBlk), &sup, blockCompareTsFn);
   if (TSDB_CODE_SUCCESS != code) {
     taosMemoryFree(sup.aRowIdx);
     taosMemoryFree(sup.aTs);
-    
     return code;
   }
+
+  SArray* aPgId = taosArrayInit(8, sizeof(int32_t));
   int32_t nRows = 0;
   int32_t nMergedRows = 0;
   bool mergeLimitReached = false;
@@ -969,7 +971,14 @@ static int32_t sortBlocksToExtSource(SSortHandle* pHandle, SArray* aBlk, SBlockO
     if (blkPgSz <= pHandle->pageSize && blkPgSz + bufInc > pHandle->pageSize) {
         SColumnInfoData* tsCol = taosArrayGet(pHandle->pDataBlock->pDataBlock, order->slotId);
         lastPageBufTs = ((int64_t*)tsCol->pData)[pHandle->pDataBlock->info.rows - 1];
-        appendDataBlockToPageBuf(pHandle, pHandle->pDataBlock, aPgId);
+        code = appendDataBlockToPageBuf(pHandle, pHandle->pDataBlock, aPgId);
+        if (code != TSDB_CODE_SUCCESS) {
+          taosMemoryFree(pTree);
+          taosArrayDestroy(aPgId);
+          taosMemoryFree(sup.aRowIdx);
+          taosMemoryFree(sup.aTs);
+          return code;
+        }
         nMergedRows += pHandle->pDataBlock->info.rows;
         blockDataCleanup(pHandle->pDataBlock);
         blkPgSz = pgHeaderSz;
@@ -1001,7 +1010,14 @@ static int32_t sortBlocksToExtSource(SSortHandle* pHandle, SArray* aBlk, SBlockO
     if (!mergeLimitReached) {
       SColumnInfoData* tsCol = taosArrayGet(pHandle->pDataBlock->pDataBlock, order->slotId);
       lastPageBufTs = ((int64_t*)tsCol->pData)[pHandle->pDataBlock->info.rows - 1];
-      appendDataBlockToPageBuf(pHandle, pHandle->pDataBlock, aPgId);
+      code = appendDataBlockToPageBuf(pHandle, pHandle->pDataBlock, aPgId);
+      if (code != TSDB_CODE_SUCCESS) {
+        taosArrayDestroy(aPgId);
+        taosMemoryFree(pTree);
+        taosMemoryFree(sup.aRowIdx);
+        taosMemoryFree(sup.aTs);
+        return code;
+      }      
       nMergedRows += pHandle->pDataBlock->info.rows;
       if ((pHandle->mergeLimit != -1) && (nMergedRows >= pHandle->mergeLimit)) {
           mergeLimitReached = true;