Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
王长生-AnH
TDengine
提交
977550a1
T
TDengine
项目概览
王长生-AnH
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
977550a1
编写于
9月 05, 2019
作者:
S
slguan
提交者:
GitHub
9月 05, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #421 from localvar/gzip-mem-leak
fix memory leak when request body is gziped
上级
3e1a8f41
2e0dc436
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
26 addition
and
20 deletion
+26
-20
src/modules/http/src/httpServer.c
src/modules/http/src/httpServer.c
+26
-20
未找到文件。
src/modules/http/src/httpServer.c
浏览文件 @
977550a1
...
...
@@ -321,28 +321,34 @@ bool httpReadDataImp(HttpContext *pContext) {
return
true
;
}
bool
httpUnCompressData
(
HttpContext
*
pContext
)
{
if
(
pContext
->
contentEncoding
==
HTTP_COMPRESS_GZIP
)
{
char
*
decompressBuf
=
calloc
(
HTTP_DECOMPRESS_BUF_SIZE
,
1
);
int32_t
decompressBufLen
=
pContext
->
parser
.
bufsize
;
int
ret
=
httpGzipDeCompress
(
pContext
->
parser
.
data
.
pos
,
pContext
->
parser
.
data
.
len
,
decompressBuf
,
&
decompressBufLen
);
if
(
ret
==
0
)
{
memcpy
(
pContext
->
parser
.
data
.
pos
,
decompressBuf
,
decompressBufLen
);
pContext
->
parser
.
data
.
pos
[
decompressBufLen
]
=
0
;
httpDump
(
"context:%p, fd:%d, ip:%s, rawSize:%d, decompressSize:%d, content:%s"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
pContext
->
parser
.
data
.
len
,
decompressBufLen
,
decompressBuf
);
}
else
{
httpError
(
"context:%p, fd:%d, ip:%s, failed to decompress data, rawSize:%d, error:%d"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
pContext
->
parser
.
data
.
len
,
ret
);
return
false
;
}
}
else
{
bool
httpDecompressData
(
HttpContext
*
pContext
)
{
if
(
pContext
->
contentEncoding
!=
HTTP_COMPRESS_GZIP
)
{
httpDump
(
"context:%p, fd:%d, ip:%s, content:%s"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
pContext
->
parser
.
data
.
pos
);
return
true
;
}
return
true
;
char
*
decompressBuf
=
calloc
(
HTTP_DECOMPRESS_BUF_SIZE
,
1
);
int32_t
decompressBufLen
=
HTTP_DECOMPRESS_BUF_SIZE
;
size_t
bufsize
=
sizeof
(
pContext
->
parser
.
buffer
)
-
(
pContext
->
parser
.
data
.
pos
-
pContext
->
parser
.
buffer
)
-
1
;
if
(
decompressBufLen
>
(
int
)
bufsize
)
{
decompressBufLen
=
(
int
)
bufsize
;
}
int
ret
=
httpGzipDeCompress
(
pContext
->
parser
.
data
.
pos
,
pContext
->
parser
.
data
.
len
,
decompressBuf
,
&
decompressBufLen
);
if
(
ret
==
0
)
{
memcpy
(
pContext
->
parser
.
data
.
pos
,
decompressBuf
,
decompressBufLen
);
pContext
->
parser
.
data
.
pos
[
decompressBufLen
]
=
0
;
httpDump
(
"context:%p, fd:%d, ip:%s, rawSize:%d, decompressSize:%d, content:%s"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
pContext
->
parser
.
data
.
len
,
decompressBufLen
,
decompressBuf
);
pContext
->
parser
.
data
.
len
=
decompressBufLen
;
}
else
{
httpError
(
"context:%p, fd:%d, ip:%s, failed to decompress data, rawSize:%d, error:%d"
,
pContext
,
pContext
->
fd
,
pContext
->
ipstr
,
pContext
->
parser
.
data
.
len
,
ret
);
}
free
(
decompressBuf
);
return
ret
==
0
;
}
bool
httpReadData
(
HttpThread
*
pThread
,
HttpContext
*
pContext
)
{
...
...
@@ -367,7 +373,7 @@ bool httpReadData(HttpThread *pThread, HttpContext *pContext) {
return
false
;
}
else
if
(
ret
==
HTTP_CHECK_BODY_SUCCESS
){
httpCleanUpContextTimer
(
pContext
);
if
(
http
UnC
ompressData
(
pContext
))
{
if
(
http
Dec
ompressData
(
pContext
))
{
return
true
;
}
else
{
httpCloseContextByServer
(
pThread
,
pContext
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录