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

Merge pull request #26958 from taosdata/fix/TD-30741/memLeak 

mem leak
This commit is contained in:
dapan1121 2024-08-02 18:27:42 +08:00 committed by GitHub
parent 69579a2a4e a2e0532c54
commit f4c68d6f3d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/libs/executor/src/executil.c
View File

@ -2001,6 +2001,7 @@ _end:
taosMemoryFree(pFuncCtx[i].input.pData); taosMemoryFree(pFuncCtx[i].input.pData);
taosMemoryFree(pFuncCtx[i].input.pColumnDataAgg); taosMemoryFree(pFuncCtx[i].input.pColumnDataAgg);
} }
taosMemoryFreeClear(*rowEntryInfoOffset);
taosMemoryFreeClear(pFuncCtx); taosMemoryFreeClear(pFuncCtx);
return NULL; return NULL;
} }

5
source/libs/executor/src/groupoperator.c
View File

@ -551,6 +551,10 @@ int32_t createGroupOperatorInfo(SOperatorInfo* downstream, SAggPhysiNode* pAggNo
pOperator->exprSupp.hasWindowOrGroup = true; pOperator->exprSupp.hasWindowOrGroup = true;
SSDataBlock* pResBlock = createDataBlockFromDescNode(pAggNode->node.pOutputDataBlockDesc); SSDataBlock* pResBlock = createDataBlockFromDescNode(pAggNode->node.pOutputDataBlockDesc);
if (pResBlock == NULL) {
code = terrno;
goto _error;
}
initBasicInfo(&pInfo->binfo, pResBlock); initBasicInfo(&pInfo->binfo, pResBlock);
int32_t numOfScalarExpr = 0; int32_t numOfScalarExpr = 0;
@ -602,6 +606,7 @@ _error:
if (pInfo != NULL) { if (pInfo != NULL) {
destroyGroupOperatorInfo(pInfo); destroyGroupOperatorInfo(pInfo);
} }
destroyOperator(pOperator);
taosMemoryFreeClear(pOperator); taosMemoryFreeClear(pOperator);
return code; return code;
} }