Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
aae34759
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
aae34759
编写于
11月 16, 2022
作者:
G
Ganlin Zhao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(query): ASAN heap buffer overflow
TD-20454
上级
4b4f8eac
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
4 deletion
+16
-4
source/libs/function/src/builtinsimpl.c
source/libs/function/src/builtinsimpl.c
+7
-2
source/libs/scalar/src/sclfunc.c
source/libs/scalar/src/sclfunc.c
+9
-2
未找到文件。
source/libs/function/src/builtinsimpl.c
浏览文件 @
aae34759
...
...
@@ -4495,18 +4495,23 @@ bool histogramFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultIn
pInfo
->
totalCount
=
0
;
pInfo
->
normalized
=
0
;
int8_t
binType
=
getHistogramBinType
(
varDataVal
(
pCtx
->
param
[
1
].
param
.
pz
));
char
*
binTypeStr
=
strndup
(
varDataVal
(
pCtx
->
param
[
1
].
param
.
pz
),
varDataLen
(
pCtx
->
param
[
1
].
param
.
pz
));
int8_t
binType
=
getHistogramBinType
(
binTypeStr
);
taosMemoryFree
(
binTypeStr
);
if
(
binType
==
UNKNOWN_BIN
)
{
return
false
;
}
char
*
binDesc
=
varDataVal
(
pCtx
->
param
[
2
].
param
.
pz
);
char
*
binDesc
=
strndup
(
varDataVal
(
pCtx
->
param
[
2
].
param
.
pz
),
varDataLen
(
pCtx
->
param
[
2
].
param
.
pz
)
);
int64_t
normalized
=
pCtx
->
param
[
3
].
param
.
i
;
if
(
normalized
!=
0
&&
normalized
!=
1
)
{
return
false
;
}
if
(
!
getHistogramBinDesc
(
pInfo
,
binDesc
,
binType
,
(
bool
)
normalized
))
{
taosMemoryFree
(
binDesc
);
return
false
;
}
taosMemoryFree
(
binDesc
);
return
true
;
}
...
...
source/libs/scalar/src/sclfunc.c
浏览文件 @
aae34759
...
...
@@ -2748,14 +2748,19 @@ int32_t histogramScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarP
int32_t
numOfBins
=
0
;
int32_t
totalCount
=
0
;
int8_t
binType
=
getHistogramBinType
(
varDataVal
(
pInput
[
1
].
columnData
->
pData
));
char
*
binDesc
=
varDataVal
(
pInput
[
2
].
columnData
->
pData
);
char
*
binTypeStr
=
strndup
(
varDataVal
(
pInput
[
1
].
columnData
->
pData
),
varDataLen
(
pInput
[
1
].
columnData
->
pData
));
int8_t
binType
=
getHistogramBinType
(
binTypeStr
);
taosMemoryFree
(
binTypeStr
);
char
*
binDesc
=
strndup
(
varDataVal
(
pInput
[
2
].
columnData
->
pData
),
varDataLen
(
pInput
[
2
].
columnData
->
pData
));
int64_t
normalized
=
*
(
int64_t
*
)(
pInput
[
3
].
columnData
->
pData
);
int32_t
type
=
GET_PARAM_TYPE
(
pInput
);
if
(
!
getHistogramBinDesc
(
&
bins
,
&
numOfBins
,
binDesc
,
binType
,
(
bool
)
normalized
))
{
taosMemoryFree
(
binDesc
);
return
TSDB_CODE_FAILED
;
}
taosMemoryFree
(
binDesc
);
for
(
int32_t
i
=
0
;
i
<
pInput
->
numOfRows
;
++
i
)
{
if
(
colDataIsNull_s
(
pInputData
,
i
))
{
...
...
@@ -2785,6 +2790,8 @@ int32_t histogramScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarP
}
}
colInfoDataEnsureCapacity
(
pOutputData
,
numOfBins
,
false
);
for
(
int32_t
k
=
0
;
k
<
numOfBins
;
++
k
)
{
int32_t
len
;
char
buf
[
512
]
=
{
0
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录