Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
c7a12740
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看板
提交
c7a12740
编写于
12月 19, 2021
作者:
X
xywang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TS-913]<fix>: fixed coredump when memcpy without checking the length
上级
846e7c54
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
46 addition
and
17 deletion
+46
-17
src/plugins/http/inc/httpInt.h
src/plugins/http/inc/httpInt.h
+1
-1
src/plugins/http/src/httpGcJson.c
src/plugins/http/src/httpGcJson.c
+45
-16
未找到文件。
src/plugins/http/inc/httpInt.h
浏览文件 @
c7a12740
...
...
@@ -37,7 +37,7 @@
#define HTTP_BUFFER_SIZE 8388608
#define HTTP_STEP_SIZE 4096 //http message get process step by step
#define HTTP_METHOD_SCANNER_SIZE 7 //http method fp size
#define HTTP_GC_TARGET_SIZE
512
#define HTTP_GC_TARGET_SIZE
16384
#define HTTP_WRITE_RETRY_TIMES 500
#define HTTP_WRITE_WAIT_TIME_MS 5
#define HTTP_PASSWORD_LEN TSDB_UNI_LEN
...
...
src/plugins/http/src/httpGcJson.c
浏览文件 @
c7a12740
...
...
@@ -129,15 +129,35 @@ bool gcBuildQueryJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result,
// for group by
if
(
groupFields
!=
-
1
)
{
char
target
[
HTTP_GC_TARGET_SIZE
<<
5
]
=
{
0
};
int32_t
len
;
len
=
snprintf
(
target
,
HTTP_GC_TARGET_SIZE
,
"%s{"
,
aliasBuffer
);
char
target
[
HTTP_GC_TARGET_SIZE
]
=
{
0
};
int32_t
len
=
0
,
cur
=
0
;
cur
=
snprintf
(
target
,
HTTP_GC_TARGET_SIZE
,
"%s{"
,
aliasBuffer
);
if
(
cur
<
0
||
cur
>=
HTTP_GC_TARGET_SIZE
)
{
httpError
(
"context:%p, fd:%d, too long alias: %s"
,
pContext
,
pContext
->
fd
,
aliasBuffer
);
return
false
;
}
len
+=
cur
;
for
(
int32_t
i
=
dataFields
+
1
;
i
<
num_fields
;
i
++
)
{
// -2 means the last '}' and '\0'
#define HTTP_GC_CHECK_SIZE(name) if (cur < 0 || cur >= HTTP_GC_TARGET_SIZE - len - 2) { \
if (cur < 0) { \
httpError("context:%p, fd:%d, failed to snprintf for: %s", pContext, pContext->fd, name); \
} else { \
httpError("context:%p, fd:%d, snprintf overflow for: %s", pContext, pContext->fd, name); \
target[len] = '\0'; \
} \
break; \
} else { \
len += cur; \
}
if
(
row
[
i
]
==
NULL
)
{
len
+=
snprintf
(
target
+
len
,
HTTP_GC_TARGET_SIZE
-
len
,
"%s:nil"
,
fields
[
i
].
name
);
cur
=
snprintf
(
target
+
len
,
HTTP_GC_TARGET_SIZE
-
len
-
2
,
"%s:nil"
,
fields
[
i
].
name
);
HTTP_GC_CHECK_SIZE
(
fields
[
i
].
name
)
if
(
i
<
num_fields
-
1
)
{
len
+=
snprintf
(
target
+
len
,
HTTP_GC_TARGET_SIZE
-
len
,
", "
);
cur
=
snprintf
(
target
+
len
,
HTTP_GC_TARGET_SIZE
-
len
-
2
,
", "
);
HTTP_GC_CHECK_SIZE
(
fields
[
i
].
name
)
}
continue
;
...
...
@@ -146,40 +166,49 @@ bool gcBuildQueryJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result,
switch
(
fields
[
i
].
type
)
{
case
TSDB_DATA_TYPE_BOOL
:
case
TSDB_DATA_TYPE_TINYINT
:
len
+=
snprintf
(
target
+
len
,
HTTP_GC_TARGET_SIZE
-
len
,
"%s:%d"
,
fields
[
i
].
name
,
*
((
int8_t
*
)
row
[
i
]));
cur
=
snprintf
(
target
+
len
,
HTTP_GC_TARGET_SIZE
-
len
-
2
,
"%s:%d"
,
fields
[
i
].
name
,
*
((
int8_t
*
)
row
[
i
]));
HTTP_GC_CHECK_SIZE
(
fields
[
i
].
name
)
break
;
case
TSDB_DATA_TYPE_SMALLINT
:
len
+=
snprintf
(
target
+
len
,
HTTP_GC_TARGET_SIZE
-
len
,
"%s:%d"
,
fields
[
i
].
name
,
*
((
int16_t
*
)
row
[
i
]));
cur
=
snprintf
(
target
+
len
,
HTTP_GC_TARGET_SIZE
-
len
-
2
,
"%s:%d"
,
fields
[
i
].
name
,
*
((
int16_t
*
)
row
[
i
]));
HTTP_GC_CHECK_SIZE
(
fields
[
i
].
name
)
break
;
case
TSDB_DATA_TYPE_INT
:
len
+=
snprintf
(
target
+
len
,
HTTP_GC_TARGET_SIZE
-
len
,
"%s:%d,"
,
fields
[
i
].
name
,
*
((
int32_t
*
)
row
[
i
]));
cur
=
snprintf
(
target
+
len
,
HTTP_GC_TARGET_SIZE
-
len
-
2
,
"%s:%d,"
,
fields
[
i
].
name
,
*
((
int32_t
*
)
row
[
i
]));
HTTP_GC_CHECK_SIZE
(
fields
[
i
].
name
)
break
;
case
TSDB_DATA_TYPE_BIGINT
:
len
+=
snprintf
(
target
+
len
,
HTTP_GC_TARGET_SIZE
-
len
,
"%s:%"
PRId64
,
fields
[
i
].
name
,
*
((
int64_t
*
)
row
[
i
]));
cur
=
snprintf
(
target
+
len
,
HTTP_GC_TARGET_SIZE
-
len
-
2
,
"%s:%"
PRId64
,
fields
[
i
].
name
,
*
((
int64_t
*
)
row
[
i
]));
HTTP_GC_CHECK_SIZE
(
fields
[
i
].
name
)
break
;
case
TSDB_DATA_TYPE_FLOAT
:
len
+=
snprintf
(
target
+
len
,
HTTP_GC_TARGET_SIZE
-
len
,
"%s:%.5f"
,
fields
[
i
].
name
,
GET_FLOAT_VAL
(
row
[
i
]));
cur
=
snprintf
(
target
+
len
,
HTTP_GC_TARGET_SIZE
-
len
-
2
,
"%s:%.5f"
,
fields
[
i
].
name
,
GET_FLOAT_VAL
(
row
[
i
]));
HTTP_GC_CHECK_SIZE
(
fields
[
i
].
name
)
break
;
case
TSDB_DATA_TYPE_DOUBLE
:
len
+=
snprintf
(
target
+
len
,
HTTP_GC_TARGET_SIZE
-
len
,
"%s:%.9f"
,
fields
[
i
].
name
,
GET_DOUBLE_VAL
(
row
[
i
]));
cur
=
snprintf
(
target
+
len
,
HTTP_GC_TARGET_SIZE
-
len
-
2
,
"%s:%.9f"
,
fields
[
i
].
name
,
GET_DOUBLE_VAL
(
row
[
i
]));
HTTP_GC_CHECK_SIZE
(
fields
[
i
].
name
)
break
;
case
TSDB_DATA_TYPE_BINARY
:
case
TSDB_DATA_TYPE_NCHAR
:
if
(
row
[
i
]
!=
NULL
)
{
len
+=
snprintf
(
target
+
len
,
HTTP_GC_TARGET_SIZE
-
len
,
"%s:"
,
fields
[
i
].
name
);
memcpy
(
target
+
len
,
(
char
*
)
row
[
i
],
MIN
(
length
[
i
],
HTTP_GC_TARGET_SIZE
-
1
-
len
));
cur
=
snprintf
(
target
+
len
,
HTTP_GC_TARGET_SIZE
-
len
-
2
,
"%s:"
,
fields
[
i
].
name
);
HTTP_GC_CHECK_SIZE
(
fields
[
i
].
name
)
memcpy
(
target
+
len
,
(
char
*
)
row
[
i
],
MIN
(
length
[
i
],
HTTP_GC_TARGET_SIZE
-
len
-
3
));
len
=
(
int32_t
)
strlen
(
target
);
}
break
;
default:
len
+=
snprintf
(
target
+
len
,
HTTP_GC_TARGET_SIZE
-
len
,
"%s:%s"
,
fields
[
i
].
name
,
"-"
);
cur
=
snprintf
(
target
+
len
,
HTTP_GC_TARGET_SIZE
-
len
-
2
,
"%s:%s"
,
fields
[
i
].
name
,
"-"
);
HTTP_GC_CHECK_SIZE
(
fields
[
i
].
name
)
break
;
}
if
(
i
<
num_fields
-
1
)
{
len
+=
snprintf
(
target
+
len
,
HTTP_GC_TARGET_SIZE
-
len
,
", "
);
cur
=
snprintf
(
target
+
len
,
HTTP_GC_TARGET_SIZE
-
len
-
2
,
", "
);
HTTP_GC_CHECK_SIZE
(
fields
[
i
].
name
)
}
}
len
+=
snprintf
(
target
+
len
,
HTTP_GC_TARGET_SIZE
-
len
,
"}"
);
cur
=
snprintf
(
target
+
len
,
HTTP_GC_TARGET_SIZE
-
len
-
1
,
"}"
);
if
(
strcmp
(
target
,
targetBuffer
)
!=
0
)
{
// first target not write this section
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录