From 59e2849756ba95ca2a857e8424a4055eb5c037f2 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Wed, 21 Aug 2024 18:37:17 +0800
Subject: [PATCH] fix(tsdb/cache): check array init's retval

---
 source/dnode/vnode/src/tsdb/tsdbCache.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbCache.c b/source/dnode/vnode/src/tsdb/tsdbCache.c
index fb72784229..cd72768379 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCache.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCache.c
@@ -1413,7 +1413,7 @@ static int32_t tsdbCacheLoadFromRaw(STsdb *pTsdb, tb_uid_t uid, SArray *pLastArr
   SIdxKey *idxKey = taosArrayGet(remainCols, 0);
   if (idxKey->key.cid != PRIMARYKEY_TIMESTAMP_COL_ID) {
     // ignore 'ts' loaded from cache and load it from tsdb
-    SLastCol* pLastCol = taosArrayGet(pLastArray, 0);
+    SLastCol *pLastCol = taosArrayGet(pLastArray, 0);
     tsdbCacheUpdateLastColToNone(pLastCol, TSDB_LAST_CACHE_NO_CACHE);
 
     SLastKey *key = &(SLastKey){.lflag = ltype, .uid = uid, .cid = PRIMARYKEY_TIMESTAMP_COL_ID};
@@ -1745,12 +1745,12 @@ int32_t tsdbCacheGetBatch(STsdb *pTsdb, tb_uid_t uid, SArray *pLastArray, SCache
           goto _exit;
         }
       }
-      if (taosArrayPush(remainCols, &(SIdxKey){i, key}) ==NULL) {
+      if (taosArrayPush(remainCols, &(SIdxKey){i, key}) == NULL) {
         code = TSDB_CODE_OUT_OF_MEMORY;
         goto _exit;
       }
       bool ignoreRocks = pLastCol ? (pLastCol->cacheStatus == TSDB_LAST_CACHE_NO_CACHE) : false;
-      if (taosArrayPush(ignoreFromRocks, &ignoreRocks) ==NULL) {
+      if (taosArrayPush(ignoreFromRocks, &ignoreRocks) == NULL) {
         code = TSDB_CODE_OUT_OF_MEMORY;
         goto _exit;
       }
@@ -1802,12 +1802,12 @@ int32_t tsdbCacheGetBatch(STsdb *pTsdb, tb_uid_t uid, SArray *pLastArray, SCache
   }
 
 _exit:
-    if (remainCols) {
-      taosArrayDestroy(remainCols);
-    }
-    if (ignoreFromRocks) {
-      taosArrayDestroy(ignoreFromRocks);
-    }
+  if (remainCols) {
+    taosArrayDestroy(remainCols);
+  }
+  if (ignoreFromRocks) {
+    taosArrayDestroy(ignoreFromRocks);
+  }
 
   TAOS_RETURN(code);
 }
@@ -2368,6 +2368,9 @@ static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow, bool *pIgnoreEarlie
 
       if (!state->pIndexList) {
         state->pIndexList = taosArrayInit(1, sizeof(SBrinBlk));
+        if (!state->pIndexList) {
+          TAOS_CHECK_GOTO(TSDB_CODE_OUT_OF_MEMORY, &lino, _err);
+        }
       } else {
         taosArrayClear(state->pIndexList);
       }
@@ -2653,7 +2656,6 @@ static int32_t getNextRowFromMem(void *iter, TSDBROW **ppRow, bool *pIgnoreEarli
         TAOS_RETURN(code);
       }
     default:
-      ASSERT(0);
       break;
   }