Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
9e0f7d93
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
9e0f7d93
编写于
7月 26, 2021
作者:
G
Ganlin Zhao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-5451]<fix>:fixed buffer overflow caused by sprintf. Removed debug prints
上级
1da9c4c9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
9 addition
and
26 deletion
+9
-26
src/client/src/tscParseLineProtocol.c
src/client/src/tscParseLineProtocol.c
+4
-21
src/util/src/tstrbuild.c
src/util/src/tstrbuild.c
+5
-5
未找到文件。
src/client/src/tscParseLineProtocol.c
浏览文件 @
9e0f7d93
...
...
@@ -1225,7 +1225,6 @@ static bool convertStrToNumber(TAOS_SML_KV *pVal, char*str) {
uint64_t
val_u
;
double
val_d
;
printf
(
"origin str:%s
\n
"
,
str
);
if
(
IS_FLOAT_TYPE
(
type
))
{
val_d
=
strtod
(
str
,
NULL
);
}
else
{
...
...
@@ -1237,19 +1236,17 @@ static bool convertStrToNumber(TAOS_SML_KV *pVal, char*str) {
}
if
(
errno
==
ERANGE
)
{
printf
(
"out of range
\n
"
);
tscError
(
"Converted number out of range
"
);
return
false
;
}
switch
(
type
)
{
case
TSDB_DATA_TYPE_TINYINT
:
if
(
!
IS_VALID_TINYINT
(
val_s
))
{
printf
(
"tiny int out of range
\n
"
);
return
false
;
}
pVal
->
value
=
calloc
(
length
,
1
);
*
(
int8_t
*
)(
pVal
->
value
)
=
(
int8_t
)
val_s
;
printf
(
"tiny int:%d
\n
"
,
*
(
int8_t
*
)(
pVal
->
value
));
break
;
case
TSDB_DATA_TYPE_UTINYINT
:
if
(
!
IS_VALID_UTINYINT
(
val_u
))
{
...
...
@@ -1257,16 +1254,13 @@ static bool convertStrToNumber(TAOS_SML_KV *pVal, char*str) {
}
pVal
->
value
=
calloc
(
length
,
1
);
*
(
uint8_t
*
)(
pVal
->
value
)
=
(
uint8_t
)
val_u
;
printf
(
"tiny uint:%u
\n
"
,
*
(
uint8_t
*
)(
pVal
->
value
));
break
;
case
TSDB_DATA_TYPE_SMALLINT
:
if
(
!
IS_VALID_SMALLINT
(
val_s
))
{
printf
(
"small int out of range
\n
"
);
return
false
;
}
pVal
->
value
=
calloc
(
length
,
1
);
*
(
int16_t
*
)(
pVal
->
value
)
=
(
int16_t
)
val_s
;
printf
(
"small int:%d
\n
"
,
*
(
int16_t
*
)(
pVal
->
value
));
break
;
case
TSDB_DATA_TYPE_USMALLINT
:
if
(
!
IS_VALID_USMALLINT
(
val_u
))
{
...
...
@@ -1274,16 +1268,13 @@ static bool convertStrToNumber(TAOS_SML_KV *pVal, char*str) {
}
pVal
->
value
=
calloc
(
length
,
1
);
*
(
uint16_t
*
)(
pVal
->
value
)
=
(
uint16_t
)
val_u
;
printf
(
"small uint:%u
\n
"
,
*
(
uint16_t
*
)(
pVal
->
value
));
break
;
case
TSDB_DATA_TYPE_INT
:
if
(
!
IS_VALID_INT
(
val_s
))
{
printf
(
"int out of range
\n
"
);
return
false
;
}
pVal
->
value
=
calloc
(
length
,
1
);
*
(
int32_t
*
)(
pVal
->
value
)
=
(
int32_t
)
val_s
;
printf
(
"int:%d
\n
"
,
*
(
int32_t
*
)(
pVal
->
value
));
break
;
case
TSDB_DATA_TYPE_UINT
:
if
(
!
IS_VALID_UINT
(
val_u
))
{
...
...
@@ -1291,16 +1282,13 @@ static bool convertStrToNumber(TAOS_SML_KV *pVal, char*str) {
}
pVal
->
value
=
calloc
(
length
,
1
);
*
(
uint32_t
*
)(
pVal
->
value
)
=
(
uint32_t
)
val_u
;
printf
(
"uint:%u
\n
"
,
*
(
uint32_t
*
)(
pVal
->
value
));
break
;
case
TSDB_DATA_TYPE_BIGINT
:
if
(
!
IS_VALID_BIGINT
(
val_s
))
{
printf
(
"big int out of range
\n
"
);
return
false
;
}
pVal
->
value
=
calloc
(
length
,
1
);
*
(
int64_t
*
)(
pVal
->
value
)
=
(
int64_t
)
val_s
;
printf
(
"big int:%ld
\n
"
,
*
(
int64_t
*
)(
pVal
->
value
));
break
;
case
TSDB_DATA_TYPE_UBIGINT
:
if
(
!
IS_VALID_UBIGINT
(
val_u
))
{
...
...
@@ -1308,25 +1296,20 @@ static bool convertStrToNumber(TAOS_SML_KV *pVal, char*str) {
}
pVal
->
value
=
calloc
(
length
,
1
);
*
(
uint64_t
*
)(
pVal
->
value
)
=
(
uint64_t
)
val_u
;
printf
(
"big uint:%lu
\n
"
,
*
(
uint64_t
*
)(
pVal
->
value
));
break
;
case
TSDB_DATA_TYPE_FLOAT
:
if
(
!
IS_VALID_FLOAT
(
val_d
))
{
printf
(
"float out of range
\n
"
);
return
false
;
}
pVal
->
value
=
calloc
(
length
,
1
);
*
(
float
*
)(
pVal
->
value
)
=
(
float
)
val_d
;
printf
(
"float:%.5e
\n
"
,
*
(
float
*
)(
pVal
->
value
));
break
;
case
TSDB_DATA_TYPE_DOUBLE
:
if
(
!
IS_VALID_DOUBLE
(
val_d
))
{
printf
(
"double out of range
\n
"
);
return
false
;
}
pVal
->
value
=
calloc
(
length
,
1
);
*
(
double
*
)(
pVal
->
value
)
=
(
double
)
val_d
;
printf
(
"double:%.5e
\n
"
,
*
(
double
*
)(
pVal
->
value
));
break
;
default:
return
false
;
...
...
@@ -1463,9 +1446,9 @@ static bool convertSmlValueType(TAOS_SML_KV *pVal, char *value,
if
(
isValidInteger
(
value
)
||
isValidFloat
(
value
))
{
pVal
->
type
=
TSDB_DATA_TYPE_FLOAT
;
pVal
->
length
=
(
int16_t
)
tDataTypes
[
pVal
->
type
].
bytes
;
pVal
->
value
=
calloc
(
pVal
->
length
,
1
);
float
val
=
(
float
)
strtold
(
value
,
NULL
)
;
memcpy
(
pVal
->
value
,
&
val
,
pVal
->
length
);
if
(
!
convertStrToNumber
(
pVal
,
value
))
{
return
false
;
}
return
true
;
}
return
false
;
...
...
src/util/src/tstrbuild.c
浏览文件 @
9e0f7d93
...
...
@@ -69,12 +69,12 @@ void taosStringBuilderAppendNull(SStringBuilder* sb) { taosStringBuilderAppendSt
void
taosStringBuilderAppendInteger
(
SStringBuilder
*
sb
,
int64_t
v
)
{
char
buf
[
64
];
size_t
len
=
s
printf
(
buf
,
"%"
PRId64
,
v
);
taosStringBuilderAppendStringLen
(
sb
,
buf
,
len
);
size_t
len
=
s
nprintf
(
buf
,
sizeof
(
buf
)
,
"%"
PRId64
,
v
);
taosStringBuilderAppendStringLen
(
sb
,
buf
,
MIN
(
len
,
sizeof
(
buf
))
);
}
void
taosStringBuilderAppendDouble
(
SStringBuilder
*
sb
,
double
v
)
{
char
buf
[
64
];
size_t
len
=
s
printf
(
buf
,
"%.9lf"
,
v
);
taosStringBuilderAppendStringLen
(
sb
,
buf
,
len
);
char
buf
[
512
];
size_t
len
=
s
nprintf
(
buf
,
sizeof
(
buf
)
,
"%.9lf"
,
v
);
taosStringBuilderAppendStringLen
(
sb
,
buf
,
MIN
(
len
,
sizeof
(
buf
))
);
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录