diff --git a/src/common/src/texpr.c b/src/common/src/texpr.c index 29fa194b24ea1ce419b7e464bfa16975ea2f9443..e02ac1f954778086e3d772944c859e0a4463654f 100644 --- a/src/common/src/texpr.c +++ b/src/common/src/texpr.c @@ -122,7 +122,7 @@ void tExprTreeDestroy(tExprNode *pNode, void (*fp)(void *)) { tfree(pNode->pSchema); } - free(pNode); + tfree(pNode); } static void doExprTreeDestroy(tExprNode **pExpr, void (*fp)(void *)) { @@ -139,12 +139,12 @@ static void doExprTreeDestroy(tExprNode **pExpr, void (*fp)(void *)) { } } else if ((*pExpr)->nodeType == TSQL_NODE_VALUE) { tVariantDestroy((*pExpr)->pVal); - free((*pExpr)->pVal); + tfree((*pExpr)->pVal); } else if ((*pExpr)->nodeType == TSQL_NODE_COL) { - free((*pExpr)->pSchema); + tfree((*pExpr)->pSchema); } - free(*pExpr); + tfree(*pExpr); *pExpr = NULL; } diff --git a/src/query/src/qFilter.c b/src/query/src/qFilter.c index d8e1d5ac5d06db15d28fe68cf5470e178a8addac..51ac8654a61f977d609b01e24a0130f2a3366d0b 100644 --- a/src/query/src/qFilter.c +++ b/src/query/src/qFilter.c @@ -862,8 +862,8 @@ int32_t filterAddFieldFromNode(SFilterInfo *info, tExprNode *node, SFilterFieldI assert(node->_node.pRight->pVal->nLen < TSDB_COL_NAME_LEN); memset(node->_node.pLeft->pSchema->name, 0, TSDB_COL_NAME_LEN); strncpy(node->_node.pLeft->pSchema->name, node->_node.pRight->pVal->pz, node->_node.pRight->pVal->nLen); - v = node->pSchema; - node->pSchema = NULL; + v = node->_node.pLeft->pSchema; + node->_node.pLeft->pSchema = NULL; }else{ CHK_RET(node->nodeType != TSQL_NODE_COL && node->nodeType != TSQL_NODE_VALUE, TSDB_CODE_QRY_APP_ERROR); if (node->nodeType == TSQL_NODE_COL) {