amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 19:00:01 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

修复http拆包bug

Browse Source
This commit is contained in:
xiongziliang 2018-09-28 21:16:39 +08:00
parent 40c1ea9b4c
commit 5aa64c3651
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Http/HttpRequestSplitter.cpp
View File

@ -41,7 +41,7 @@ void HttpRequestSplitter::input(const char *data,uint64_t len) {
len = _remain_data.size();
}
splitPacket:
splitPacket:
/*确保ptr最后一个字节是0，防止strstr越界
*由于ZLToolKit确保内存最后一个字节是保留未使用字节并置0，
@ -75,7 +75,8 @@ splitPacket:
if(_content_len == 0){
//尚未找到http头，缓存定位到剩余数据部分
_remain_data.assign(ptr,remain);
string str(ptr,remain);
_remain_data = str;
return;
}
@ -84,7 +85,8 @@ splitPacket:
//数据按照固定长度content处理
if(remain < _content_len){
//数据不够，缓存定位到剩余数据部分
_remain_data.assign(ptr,remain);
string str(ptr,remain);
_remain_data = str;
return;
}
//收到content数据，并且接受content完毕
@ -97,12 +99,14 @@ splitPacket:
if(remain > 0){
//还有数据没有处理完毕
_remain_data.assign(ptr,remain);
string str(ptr,remain);
_remain_data = str;
data = ptr = (char *)_remain_data.data();
len = _remain_data.size();
goto splitPacket;
}
_remain_data.clear();
return;
}