Merge pull request taosdata#22969 from taosdata/fix/m/TS-4013

fix: query tbname from systables memory corruption
facetosea · Sep 19, 2023 · dfdcbde · dfdcbde
2 parents aabd7a5 + b7725ac
commit dfdcbde
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
@@ -2353,27 +2353,26 @@ void trimDataBlock(SSDataBlock* pBlock, int32_t totalRows, const bool* pBoolList
   int32_t maxRows = 0;
 
   size_t numOfCols = taosArrayGetSize(pBlock->pDataBlock);
-  for (int32_t i = 0; i < numOfCols; ++i) {
-    SColumnInfoData* pDst = taosArrayGet(pBlock->pDataBlock, i);
-    // it is a reserved column for scalar function, and no data in this column yet.
-    if (pDst->pData == NULL) {
-      continue;
-    }
+  if (!pBoolList) {
+    for (int32_t i = 0; i < numOfCols; ++i) {
+      SColumnInfoData* pDst = taosArrayGet(pBlock->pDataBlock, i);
+      // it is a reserved column for scalar function, and no data in this column yet.
+      if (pDst->pData == NULL) {
+        continue;
+      }
 
-    int32_t numOfRows = 0;
-    if (IS_VAR_DATA_TYPE(pDst->info.type)) {
-      pDst->varmeta.length = 0;
+      int32_t numOfRows = 0;
+      if (IS_VAR_DATA_TYPE(pDst->info.type)) {
+        pDst->varmeta.length = 0;
+      }
     }
-  }
-
-  if (NULL == pBoolList) {
     return;
   }
-  
+
   for (int32_t i = 0; i < numOfCols; ++i) {
     SColumnInfoData* pDst = taosArrayGet(pBlock->pDataBlock, i);
     // it is a reserved column for scalar function, and no data in this column yet.
-    if (pDst->pData == NULL) {
+    if (pDst->pData == NULL || (IS_VAR_DATA_TYPE(pDst->info.type) && pDst->varmeta.length == 0)) {
       continue;
     }