未验证 提交 d3a3ff7b 编写于 作者: M Minglei Jin 提交者: GitHub

Merge pull request #14871 from taosdata/fix/TS-1640-2.4

fix: resolve memory leak on select interp... where range...
...@@ -6,6 +6,7 @@ cmake-build-debug/ ...@@ -6,6 +6,7 @@ cmake-build-debug/
cmake-build-release/ cmake-build-release/
cscope.out cscope.out
cscope.files cscope.files
tags
.DS_Store .DS_Store
debug/ debug/
release/ release/
......
...@@ -7,7 +7,6 @@ LFLAGS = '-Wl,-rpath,/usr/local/taos/driver/' -ltaos -lpthread -lm -lrt ...@@ -7,7 +7,6 @@ LFLAGS = '-Wl,-rpath,/usr/local/taos/driver/' -ltaos -lpthread -lm -lrt
CFLAGS = -O3 -g -Wall -Wno-deprecated -fPIC -Wno-unused-result -Wconversion \ CFLAGS = -O3 -g -Wall -Wno-deprecated -fPIC -Wno-unused-result -Wconversion \
-Wno-char-subscripts -D_REENTRANT -Wno-format -D_REENTRANT -DLINUX \ -Wno-char-subscripts -D_REENTRANT -Wno-format -D_REENTRANT -DLINUX \
-Wno-unused-function -D_M_X64 -I/usr/local/taos/include -std=gnu99 \ -Wno-unused-function -D_M_X64 -I/usr/local/taos/include -std=gnu99 \
-I../../../deps/cJson/inc \
-Wno-unused-function -D_M_X64 -I/usr/local/taos/include -std=gnu99 \ -Wno-unused-function -D_M_X64 -I/usr/local/taos/include -std=gnu99 \
-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment
......
...@@ -96,9 +96,11 @@ typedef struct SIntervalVal { ...@@ -96,9 +96,11 @@ typedef struct SIntervalVal {
SStrToken offset; SStrToken offset;
} SIntervalVal; } SIntervalVal;
typedef struct tSqlExpr tSqlExprTimestamp;
typedef struct SRangeVal { typedef struct SRangeVal {
void *start; tSqlExprTimestamp *start;
void *end; tSqlExprTimestamp *end;
} SRangeVal; } SRangeVal;
typedef struct SSessionWindowVal { typedef struct SSessionWindowVal {
......
...@@ -1159,6 +1159,10 @@ void destroySqlNode(SSqlNode *pSqlNode) { ...@@ -1159,6 +1159,10 @@ void destroySqlNode(SSqlNode *pSqlNode) {
pSqlNode->fillType = NULL; pSqlNode->fillType = NULL;
tSqlExprDestroy(pSqlNode->pHaving); tSqlExprDestroy(pSqlNode->pHaving);
tSqlExprDestroy(pSqlNode->pRange.start);
tSqlExprDestroy(pSqlNode->pRange.end);
free(pSqlNode); free(pSqlNode);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册