Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
ecc37adc
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看板
未验证
提交
ecc37adc
编写于
5月 24, 2022
作者:
M
Minglei Jin
提交者:
GitHub
5月 24, 2022
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #12913 from taosdata/fix/TS-1547-D
fix(query): fixed a heap buffer overflow bug
上级
7cd9af72
ebdb2488
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
42 addition
and
7 deletion
+42
-7
src/client/src/tscParseLineProtocol.c
src/client/src/tscParseLineProtocol.c
+42
-7
未找到文件。
src/client/src/tscParseLineProtocol.c
浏览文件 @
ecc37adc
...
...
@@ -1141,29 +1141,64 @@ static int doSmlInsertOneDataPoint(TAOS* taos, TAOS_SML_DATA_POINT* point, SSmlL
uint8_t
precision
=
tableMeta
->
tableInfo
.
precision
;
free
(
tableMeta
);
char
*
sql
=
malloc
(
TSDB_MAX_SQL_LEN
+
1
);
int
freeBytes
=
TSDB_MAX_SQL_LEN
;
char
*
sql
=
malloc
(
tsMaxSQLStringLen
+
1
);
if
(
sql
==
NULL
)
{
tscError
(
"SML:0x%"
PRIx64
" failed to allocate memory for sql"
,
info
->
id
);
return
TSDB_CODE_TSC_OUT_OF_MEMORY
;
}
int
freeBytes
=
tsMaxSQLStringLen
;
int
sqlLen
=
0
;
int
retLen
;
sqlLen
+=
snprintf
(
sql
+
sqlLen
,
freeBytes
-
sqlLen
,
"insert into %s("
,
point
->
childTableName
);
for
(
int
col
=
0
;
col
<
point
->
fieldNum
;
++
col
)
{
TAOS_SML_KV
*
kv
=
point
->
fields
+
col
;
sqlLen
+=
snprintf
(
sql
+
sqlLen
,
freeBytes
-
sqlLen
,
"%s,"
,
kv
->
key
);
retLen
=
snprintf
(
sql
+
sqlLen
,
freeBytes
-
sqlLen
,
"%s,"
,
kv
->
key
);
if
(
retLen
>=
freeBytes
-
sqlLen
)
{
tscError
(
"SML:0x%"
PRIx64
" no free space for building sql key"
,
info
->
id
);
return
TSDB_CODE_TSC_OUT_OF_MEMORY
;
}
sqlLen
+=
retLen
;
}
--
sqlLen
;
sqlLen
+=
snprintf
(
sql
+
sqlLen
,
freeBytes
-
sqlLen
,
") values ("
);
retLen
+=
snprintf
(
sql
+
sqlLen
,
freeBytes
-
sqlLen
,
") values ("
);
if
(
retLen
>=
freeBytes
-
sqlLen
)
{
tscError
(
"SML:0x%"
PRIx64
" no free space for building sql"
,
info
->
id
);
return
TSDB_CODE_TSC_OUT_OF_MEMORY
;
}
sqlLen
+=
retLen
;
TAOS_SML_KV
*
tsField
=
point
->
fields
+
0
;
int64_t
ts
=
*
(
int64_t
*
)(
tsField
->
value
);
ts
=
convertTimePrecision
(
ts
,
TSDB_TIME_PRECISION_NANO
,
precision
);
sqlLen
+=
snprintf
(
sql
+
sqlLen
,
freeBytes
-
sqlLen
,
"%"
PRId64
","
,
ts
);
retLen
=
snprintf
(
sql
+
sqlLen
,
freeBytes
-
sqlLen
,
"%"
PRId64
","
,
ts
);
if
(
retLen
>=
freeBytes
-
sqlLen
)
{
tscError
(
"SML:0x%"
PRIx64
" no free space for building timestamp"
,
info
->
id
);
return
TSDB_CODE_TSC_OUT_OF_MEMORY
;
}
sqlLen
+=
retLen
;
for
(
int
col
=
1
;
col
<
point
->
fieldNum
;
++
col
)
{
TAOS_SML_KV
*
kv
=
point
->
fields
+
col
;
int32_t
len
=
0
;
if
(
freeBytes
-
sqlLen
<=
kv
->
length
)
{
tscError
(
"SML:0x%"
PRIx64
" no free space for converToStr"
,
info
->
id
);
return
TSDB_CODE_TSC_OUT_OF_MEMORY
;
}
converToStr
(
sql
+
sqlLen
,
kv
->
type
,
kv
->
value
,
kv
->
length
,
&
len
);
sqlLen
+=
len
;
sqlLen
+=
snprintf
(
sql
+
sqlLen
,
freeBytes
-
sqlLen
,
","
);
retLen
=
snprintf
(
sql
+
sqlLen
,
freeBytes
-
sqlLen
,
","
);
if
(
retLen
>=
freeBytes
-
sqlLen
)
{
tscError
(
"SML:0x%"
PRIx64
" no free space for building sql comma"
,
info
->
id
);
return
TSDB_CODE_TSC_OUT_OF_MEMORY
;
}
sqlLen
+=
retLen
;
}
--
sqlLen
;
sqlLen
+=
snprintf
(
sql
+
sqlLen
,
freeBytes
-
sqlLen
,
")"
);
retLen
=
snprintf
(
sql
+
sqlLen
,
freeBytes
-
sqlLen
,
")"
);
if
(
retLen
>=
freeBytes
-
sqlLen
)
{
tscError
(
"SML:0x%"
PRIx64
" no free space for building the last right parenthesis"
,
info
->
id
);
return
TSDB_CODE_TSC_OUT_OF_MEMORY
;
}
sqlLen
+=
retLen
;
sql
[
sqlLen
]
=
0
;
tscDebug
(
"SML:0x%"
PRIx64
" insert child table table %s of super table %s sql: %s"
,
info
->
id
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录