Commitb930b8e

LoopinFool

authored and

deanberris

committed

Fix chunk and content-length encoding (#759)

* The entire body has already been placed in partial_parsed, so don't direct the callback to append any more data* 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.

1 parentcef6472 commitb930b8eCopy full SHA for b930b8e

File tree

1 file changed

-8

lines changed

boost/network/protocol/http/client/connection
- async_protocol_handler.hpp

1 file changed

-8

lines changed

`‎boost/network/protocol/http/client/connection/async_protocol_handler.hpp`

Lines changed: 9 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -361,22 +361,23 @@ struct http_async_protocol_handler {`
`361`	`361`	`for (typename string_type::const_iterator iter =`
`362`	`362`	`std::search(begin, partial_parsed.end(), crlf.begin(), crlf.end());`
`363`	`363`	`iter != partial_parsed.end();`
`364`		`- iter =`
`365`		`-std::search(begin, partial_parsed.end(), crlf.begin(), crlf.end())) {`
	`364`	`+ iter =std::search(begin, partial_parsed.end(), crlf.begin(), crlf.end())) {`
`366`	`365`	`string_typeline(begin, iter);`
`367`	`366`	`if (line.empty()) {`
`368`		`-std::advance(iter,2);`
`369`		`-begin = iter;`
`370`		`-continue;`
	`367`	`+std::advance(iter,2);`
	`368`	`+ begin = iter;`
	`369`	`+continue;`
`371`	`370`	`}`
`372`	`371`	`std::stringstreamstream(line);`
`373`	`372`	`int len;`
`374`	`373`	`stream >> std::hex >> len;`
`375`	`374`	`std::advance(iter,2);`
`376`	`375`	`if (!len)returntrue;`
`377`	`376`	`if (len <= partial_parsed.end() - iter) {`
`378`		`-std::advance(iter, len +2);`
`379`		`- }`
	`377`	`+std::advance(iter, len);`
	`378`	`+ }else {`
	`379`	`+returnfalse;`
	`380`	`+ }`
`380`	`381`	`begin = iter;`
`381`	`382`	`}`
`382`	`383`	`returnfalse;`
`@@ -391,7 +392,7 @@ struct http_async_protocol_handler {`
`391`	`392`	`partial_parsed.append(part_begin, it);`
`392`	`393`	`part_begin = part.begin();`
`393`	`394`	`if (check_parse_body_complete()) {`
`394`		`-callback(boost::asio::error::eof,bytes);`
	`395`	`+callback(boost::asio::error::eof,0);`
`395`	`396`	`}else {`
`396`	`397`	`delegate_->read_some(`
`397`	`398`	`boost::asio::mutable_buffers_1(part.data(), part.size()), callback);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitb930b8e

File tree

1 file changed

1 file changed

`‎boost/network/protocol/http/client/connection/async_protocol_handler.hpp`

0 commit comments