From 493a23a4803da53ca7ae5ab61b47ac135ca247eb Mon Sep 17 00:00:00 2001
From: Haolin Wang <haolinwang@taosdata.com>
Date: Tue, 24 Dec 2024 08:09:35 +0800
Subject: [PATCH] fix: free unallocated memory in tsdbRowClose()

---
 source/dnode/vnode/src/tsdb/tsdbCache.c | 6 ++----
 source/dnode/vnode/src/tsdb/tsdbUtil.c  | 4 +++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbCache.c b/source/dnode/vnode/src/tsdb/tsdbCache.c
index 2047b68101..5151ea3958 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCache.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCache.c
@@ -610,6 +610,7 @@ int32_t tsdbLoadFromImem(SMemTable *imem, int64_t suid, int64_t uid) {
   int32_t     nCol;
   SArray     *ctxArray = pTsdb->rCache.ctxArray;
   STsdbRowKey tsdbRowKey = {0};
+  STSDBRowIter iter = {0};
 
   STbData *pIMem = tsdbGetTbDataFromMemTable(imem, suid, uid);
 
@@ -641,7 +642,6 @@ int32_t tsdbLoadFromImem(SMemTable *imem, int64_t suid, int64_t uid) {
 
   tsdbRowGetKey(pMemRow, &tsdbRowKey);
 
-  STSDBRowIter iter = {0};
   TAOS_CHECK_EXIT(tsdbRowIterOpen(&iter, pMemRow, pTSchema));
 
   int32_t iCol = 0;
@@ -685,7 +685,6 @@ int32_t tsdbLoadFromImem(SMemTable *imem, int64_t suid, int64_t uid) {
     STsdbRowKey tsdbRowKey = {0};
     tsdbRowGetKey(pMemRow, &tsdbRowKey);
 
-    STSDBRowIter iter = {0};
     TAOS_CHECK_EXIT(tsdbRowIterOpen(&iter, pMemRow, pTSchema));
 
     int32_t iCol = 0;
@@ -2470,6 +2469,7 @@ static int32_t tsdbCacheGetBatchFromMem(STsdb *pTsdb, tb_uid_t uid, SArray *pLas
   int            numKeys = TARRAY_SIZE(pCidList);
   MemNextRowIter iter = {0};
   SSHashObj     *iColHash = NULL;
+  STSDBRowIter   rowIter = {0};
 
   // 1, get from mem, imem filtered with delete info
   TAOS_CHECK_EXIT(memRowIterOpen(&iter, uid, pTsdb, pTSchema, pr->info.suid, pr->pReadSnap, pr));
@@ -2490,7 +2490,6 @@ static int32_t tsdbCacheGetBatchFromMem(STsdb *pTsdb, tb_uid_t uid, SArray *pLas
   STsdbRowKey rowKey = {0};
   tsdbRowGetKey(pRow, &rowKey);
 
-  STSDBRowIter rowIter = {0};
   TAOS_CHECK_EXIT(tsdbRowIterOpen(&rowIter, pRow, pTSchema));
 
   int32_t iCol = 0, jCol = 0, jnCol = TARRAY_SIZE(pLastArray);
@@ -2564,7 +2563,6 @@ static int32_t tsdbCacheGetBatchFromMem(STsdb *pTsdb, tb_uid_t uid, SArray *pLas
       STsdbRowKey tsdbRowKey = {0};
       tsdbRowGetKey(pRow, &tsdbRowKey);
 
-      STSDBRowIter rowIter = {0};
       TAOS_CHECK_EXIT(tsdbRowIterOpen(&rowIter, pRow, pTSchema));
 
       iCol = 0;
diff --git a/source/dnode/vnode/src/tsdb/tsdbUtil.c b/source/dnode/vnode/src/tsdb/tsdbUtil.c
index f807ecf2d6..16f6777765 100644
--- a/source/dnode/vnode/src/tsdb/tsdbUtil.c
+++ b/source/dnode/vnode/src/tsdb/tsdbUtil.c
@@ -699,9 +699,11 @@ int32_t tsdbRowIterOpen(STSDBRowIter *pIter, TSDBROW *pRow, STSchema *pTSchema)
 }
 
 void tsdbRowClose(STSDBRowIter *pIter) {
-  if (pIter->pRow->type == TSDBROW_ROW_FMT) {
+  if (pIter->pRow && pIter->pRow->type == TSDBROW_ROW_FMT) {
     tRowIterClose(&pIter->pIter);
   }
+  pIter->pRow = NULL;
+  pIter->pIter = NULL;
 }
 
 SColVal *tsdbRowIterNext(STSDBRowIter *pIter) {