Skip to content

Fix chunk and content-length encoding #759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deanberris merged 2 commits into from
May 15, 2017
Merged

Fix chunk and content-length encoding #759

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c3dec6
The entire body has already been placed in partial_parsed, so don't d…
LoopinFool May 11, 2017
3ad7753
Cleaned up indentation.
May 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Cleaned up indentation. 
Don't potentially access memory beyond the end of the string buffer.
In the case of a partial chunk, exit the loop. Continuing to search for crlf in the middle of a binary data chunk can result in an infinite loop, and wasn't the right logic.
  • Loading branch information
Aaron Avery committed May 11, 2017
commit 3ad7753865e5c34ca5684f8cb32db3c2ac481c34
15 changes: 8 additions & 7 deletions boost/network/protocol/http/client/connection/async_protocol_handler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,22 +361,23 @@ struct http_async_protocol_handler {
for (typename string_type::const_iterator iter =
std::search(begin, partial_parsed.end(), crlf.begin(), crlf.end());
iter != partial_parsed.end();
iter =
std::search(begin, partial_parsed.end(), crlf.begin(), crlf.end())) {
iter = std::search(begin, partial_parsed.end(), crlf.begin(), crlf.end())) {
string_type line(begin, iter);
if (line.empty()) {
std::advance(iter, 2);
begin = iter;
continue;
std::advance(iter, 2);
begin = iter;
continue;
}
std::stringstream stream(line);
int len;
stream >> std::hex >> len;
std::advance(iter, 2);
if (!len) return true;
if (len <= partial_parsed.end() - iter) {
std::advance(iter, len + 2);
}
std::advance(iter, len);
} else {
return false;
}
begin = iter;
}
return false;
Expand Down