xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

use strncpy

This commit is contained in:
54liuyao 2024-01-17 16:52:47 +08:00
parent 94ab74cc7f
commit 1309e56a95
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/libs/executor/src/exchangeoperator.c
View File

@ -260,12 +260,12 @@ static int32_t initDataSource(int32_t numOfSources, SExchangeInfo* pInfo, const
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
int32_t len = strlen(id); int32_t len = strlen(id) + 1;
for (int32_t i = 0; i < numOfSources; ++i) { for (int32_t i = 0; i < numOfSources; ++i) {
SSourceDataInfo dataInfo = {0}; SSourceDataInfo dataInfo = {0};
dataInfo.status = EX_SOURCE_DATA_NOT_READY; dataInfo.status = EX_SOURCE_DATA_NOT_READY;
dataInfo.taskId = taosMemoryCalloc(1, len); dataInfo.taskId = taosMemoryCalloc(1, len);
memcpy(dataInfo.taskId, id, len); strncpy(dataInfo.taskId, id, len);
dataInfo.index = i; dataInfo.index = i;
SSourceDataInfo* pDs = taosArrayPush(pInfo->pSourceDataInfo, &dataInfo); SSourceDataInfo* pDs = taosArrayPush(pInfo->pSourceDataInfo, &dataInfo);
if (pDs == NULL) { if (pDs == NULL) {
@ -786,9 +786,9 @@ int32_t addSingleExchangeSource(SOperatorInfo* pOperator, SExchangeOperatorBasic
SSourceDataInfo dataInfo = {0}; SSourceDataInfo dataInfo = {0};
dataInfo.status = EX_SOURCE_DATA_NOT_READY; dataInfo.status = EX_SOURCE_DATA_NOT_READY;
char* pTaskId = GET_TASKID(pOperator->pTaskInfo); char* pTaskId = GET_TASKID(pOperator->pTaskInfo);
int32_t len = strlen(pTaskId); int32_t len = strlen(pTaskId) + 1;
dataInfo.taskId = taosMemoryCalloc(1, len); dataInfo.taskId = taosMemoryCalloc(1, len);
memcpy(dataInfo.taskId, pTaskId, len); strncpy(dataInfo.taskId, pTaskId, len);
dataInfo.index = pIdx->srcIdx; dataInfo.index = pIdx->srcIdx;
dataInfo.pSrcUidList = taosArrayDup(pBasicParam->uidList, NULL); dataInfo.pSrcUidList = taosArrayDup(pBasicParam->uidList, NULL);
dataInfo.srcOpType = pBasicParam->srcOpType; dataInfo.srcOpType = pBasicParam->srcOpType;