From 105594848cfd15f2f51c4b367219333618b047b4 Mon Sep 17 00:00:00 2001 From: Minglei Jin Date: Fri, 9 Aug 2024 17:00:18 +0800 Subject: [PATCH] fix(tsdb/cache): return oom if array or push failed --- source/dnode/vnode/src/tsdb/tsdbCache.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbCache.c b/source/dnode/vnode/src/tsdb/tsdbCache.c index b7e3bb6a07..1216f0da81 100644 --- a/source/dnode/vnode/src/tsdb/tsdbCache.c +++ b/source/dnode/vnode/src/tsdb/tsdbCache.c @@ -1703,8 +1703,14 @@ int32_t tsdbCacheGetBatch(STsdb *pTsdb, tb_uid_t uid, SArray *pLastArray, SCache if (!remainCols) { remainCols = taosArrayInit(num_keys, sizeof(SIdxKey)); + if (!remainCols) { + TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY); + } } - (void)taosArrayPush(remainCols, &(SIdxKey){i, key}); + if (NULL == taosArrayPush(remainCols, &(SIdxKey){i, key})) { + taosArrayDestroy(remainCols); + TAOS_RETURN(TSDB_CODE_OUT_OF_MEMORY); + }; } }