From 633b3de9b64aa791564af116d8e72e276982ac8b Mon Sep 17 00:00:00 2001 From: Xiaoyu Wang Date: Fri, 7 Jan 2022 17:31:24 -0500 Subject: [PATCH] TD-12760 bug fix --- source/libs/parser/src/parser.c | 3 +++ source/libs/planner/src/physicalPlanJson.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/source/libs/parser/src/parser.c b/source/libs/parser/src/parser.c index d22f92517d..f440e6cdfe 100644 --- a/source/libs/parser/src/parser.c +++ b/source/libs/parser/src/parser.c @@ -237,6 +237,9 @@ void qParserCleanupMetaRequestInfo(SCatalogReq* pMetaReq) { } void qDestroyQuery(SQueryNode* pQueryNode) { + if (NULL == pQueryNode) { + return; + } if (nodeType(pQueryNode) == TSDB_SQL_INSERT || nodeType(pQueryNode) == TSDB_SQL_CREATE_TABLE) { SVnodeModifOpStmtInfo* pModifInfo = (SVnodeModifOpStmtInfo*)pQueryNode; taosArrayDestroy(pModifInfo->pDataBlocks); diff --git a/source/libs/planner/src/physicalPlanJson.c b/source/libs/planner/src/physicalPlanJson.c index faeed74f1a..20da1842cf 100644 --- a/source/libs/planner/src/physicalPlanJson.c +++ b/source/libs/planner/src/physicalPlanJson.c @@ -398,7 +398,7 @@ static bool exprNodeFromJson(const cJSON* json, void* obj) { case TEXPR_FUNCTION_NODE: return fromObject(json, jkExprNodeFunction, functionFromJson, exprInfo, false); case TEXPR_COL_NODE: - return fromObject(json, jkExprNodeColumn, schemaFromJson, exprInfo->pSchema, false); + return fromObjectWithAlloc(json, jkExprNodeColumn, schemaFromJson, (void**)&exprInfo->pSchema, sizeof(SSchema), false); case TEXPR_VALUE_NODE: return fromObject(json, jkExprNodeValue, variantFromJson, exprInfo->pVal, false); default: -- GitLab