Merge pull request #18121 from taosdata/fix/TD-20382-D

fix: null pointer when merge col data of varchar

Merge pull request #18121 from taosdata/fix/TD-20382-D
fix: null pointer when merge col data of varchar
bb4c2ddc · dapan1121 · GitHub · 3fae6360 · 1d795f5c · bb4c2ddc
隐藏空白更改
内联并排

Showing with 3 addition and 1 deletion

source/common/src/tdatablock.c source/common/src/tdatablock.c +3 -1

未找到文件。
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -277,7 +277,9 @@ int32_t colDataMergeCol(SColumnInfoData* pColumnInfoData, int32_t numOfRow1, int
      pColumnInfoData->varmeta.allocLen = len + oldLen;
    }

-    memcpy(pColumnInfoData->pData + oldLen, pSource->pData, len);
+    if (pColumnInfoData->pData && pSource->pData) { // TD-20382
+      memcpy(pColumnInfoData->pData + oldLen, pSource->pData, len);
+    }
    pColumnInfoData->varmeta.length = len + oldLen;
  } else {
    if (finalNumOfRows > (*capacity)) {