From c8e4f47a2e13982ab34fab3566f891ffc844eaca Mon Sep 17 00:00:00 2001 From: zhihaop Date: Mon, 26 Sep 2022 18:53:36 +0800 Subject: [PATCH] fix(query): resources leaks in qExecutor.c --- src/query/src/qExecutor.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c index 0f1ea8c05b..a0d183e823 100644 --- a/src/query/src/qExecutor.c +++ b/src/query/src/qExecutor.c @@ -5981,6 +5981,7 @@ SOperatorInfo *createOrderOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorI pDataBlock->pDataBlock = taosArrayInit(numOfOutput, sizeof(SColumnInfoData)); if (pDataBlock->pDataBlock == NULL) { + free(pDataBlock); goto _clean; } @@ -7759,6 +7760,11 @@ SOperatorInfo* createTimeIntervalOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOp return NULL; } + SOperatorInfo* pOperator = calloc(1, sizeof(SOperatorInfo)); + if (pOperator == NULL) { + goto _clean; + } + pInfo->pCtx = createSQLFunctionCtx(pRuntimeEnv, pExpr, numOfOutput, &pInfo->rowCellInfoOffset); pInfo->pRes = createOutputBuf(pExpr, numOfOutput, pRuntimeEnv->resultInfo.capacity); initResultRowInfo(&pInfo->resultRowInfo, 8, TSDB_DATA_TYPE_INT); @@ -7767,11 +7773,6 @@ SOperatorInfo* createTimeIntervalOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOp goto _clean; } - SOperatorInfo* pOperator = calloc(1, sizeof(SOperatorInfo)); - if (pOperator == NULL) { - goto _clean; - } - pOperator->name = "TimeIntervalAggOperator"; pOperator->operatorType = OP_TimeWindow; pOperator->blockingOptr = true; -- GitLab