Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
bb7c70e6
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看板
提交
bb7c70e6
编写于
9月 06, 2021
作者:
X
xywang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-6217]<fix>: fixed memory leak that caused by invalid http requests
上级
aa4d3cb3
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
9 addition
and
3 deletion
+9
-3
src/plugins/http/inc/httpInt.h
src/plugins/http/inc/httpInt.h
+1
-0
src/plugins/http/src/httpContext.c
src/plugins/http/src/httpContext.c
+3
-2
src/plugins/http/src/httpParser.c
src/plugins/http/src/httpParser.c
+5
-1
未找到文件。
src/plugins/http/inc/httpInt.h
浏览文件 @
bb7c70e6
...
@@ -147,6 +147,7 @@ typedef struct HttpContext {
...
@@ -147,6 +147,7 @@ typedef struct HttpContext {
int32_t
state
;
int32_t
state
;
uint8_t
reqType
;
uint8_t
reqType
;
uint8_t
parsed
;
uint8_t
parsed
;
uint8_t
error
;
char
ipstr
[
22
];
char
ipstr
[
22
];
char
user
[
TSDB_USER_LEN
];
// parsed from auth token or login message
char
user
[
TSDB_USER_LEN
];
// parsed from auth token or login message
char
pass
[
HTTP_PASSWORD_LEN
];
char
pass
[
HTTP_PASSWORD_LEN
];
...
...
src/plugins/http/src/httpContext.c
浏览文件 @
bb7c70e6
...
@@ -188,11 +188,12 @@ void httpCloseContextByApp(HttpContext *pContext) {
...
@@ -188,11 +188,12 @@ void httpCloseContextByApp(HttpContext *pContext) {
pContext
->
parsed
=
false
;
pContext
->
parsed
=
false
;
bool
keepAlive
=
true
;
bool
keepAlive
=
true
;
if
(
parser
&&
parser
->
httpVersion
==
HTTP_VERSION_10
&&
parser
->
keepAlive
!=
HTTP_KEEPALIVE_ENABLE
)
{
if
(
pContext
->
error
==
true
)
{
keepAlive
=
false
;
}
else
if
(
parser
&&
parser
->
httpVersion
==
HTTP_VERSION_10
&&
parser
->
keepAlive
!=
HTTP_KEEPALIVE_ENABLE
)
{
keepAlive
=
false
;
keepAlive
=
false
;
}
else
if
(
parser
&&
parser
->
httpVersion
!=
HTTP_VERSION_10
&&
parser
->
keepAlive
==
HTTP_KEEPALIVE_DISABLE
)
{
}
else
if
(
parser
&&
parser
->
httpVersion
!=
HTTP_VERSION_10
&&
parser
->
keepAlive
==
HTTP_KEEPALIVE_DISABLE
)
{
keepAlive
=
false
;
keepAlive
=
false
;
}
else
{
}
}
if
(
keepAlive
)
{
if
(
keepAlive
)
{
...
...
src/plugins/http/src/httpParser.c
浏览文件 @
bb7c70e6
...
@@ -663,7 +663,7 @@ static int32_t httpParserOnTarget(HttpParser *parser, HTTP_PARSER_STATE state, c
...
@@ -663,7 +663,7 @@ static int32_t httpParserOnTarget(HttpParser *parser, HTTP_PARSER_STATE state, c
HttpContext
*
pContext
=
parser
->
pContext
;
HttpContext
*
pContext
=
parser
->
pContext
;
int32_t
ok
=
0
;
int32_t
ok
=
0
;
do
{
do
{
if
(
!
isspace
(
c
))
{
if
(
!
isspace
(
c
)
&&
c
!=
'\r'
&&
c
!=
'\n'
)
{
if
(
httpAppendString
(
&
parser
->
str
,
&
c
,
1
))
{
if
(
httpAppendString
(
&
parser
->
str
,
&
c
,
1
))
{
httpError
(
"context:%p, fd:%d, parser state:%d, char:[%c]%02x, oom"
,
pContext
,
pContext
->
fd
,
state
,
c
,
c
);
httpError
(
"context:%p, fd:%d, parser state:%d, char:[%c]%02x, oom"
,
pContext
,
pContext
->
fd
,
state
,
c
,
c
);
ok
=
-
1
;
ok
=
-
1
;
...
@@ -1157,6 +1157,10 @@ static int32_t httpParseChar(HttpParser *parser, const char c, int32_t *again) {
...
@@ -1157,6 +1157,10 @@ static int32_t httpParseChar(HttpParser *parser, const char c, int32_t *again) {
httpOnError
(
parser
,
HTTP_CODE_INTERNAL_SERVER_ERROR
,
TSDB_CODE_HTTP_PARSE_ERROR_STATE
);
httpOnError
(
parser
,
HTTP_CODE_INTERNAL_SERVER_ERROR
,
TSDB_CODE_HTTP_PARSE_ERROR_STATE
);
}
}
if
(
ok
!=
0
)
{
pContext
->
error
=
1
;
}
return
ok
;
return
ok
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录