feedc0de/boost_beast
1
0
Fork 0
forked from boostorg/beast
Code Pull Requests Activity

Increase utf8 checker code coverage

Browse Source
This commit is contained in:
Miguel Portilla
2017-07-20 08:12:14 -07:00
committed by Vinnie Falco
parent 5089cf59ee
commit c49bee78db
2 changed files with 97 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/beast/websocket/detail/utf8_checker.hpp
+4 -6
View File
@@ -153,9 +153,8 @@ utf8_checker_t<_>::write(std::uint8_t const* in, std::size_t size)
}
if ((in[0] & 0x60) == 0x40)
{
if ((in[0] & 0xfe) == 0xc0 ||
(in[1] & 0xc0) != 0x80)
return false;
if ((in[1] & 0xc0) != 0x80)
return false;
in += 2;
return true;
}
@@ -200,9 +199,8 @@ utf8_checker_t<_>::write(std::uint8_t const* in, std::size_t size)
if ((have_[0] & 0xf8) == 0xf0)
{
auto const size = p_ - have_;
if (have_[0] > 244 ||
(size > 2 && (have_[2] & 0xc0) != 0x80))
return false;
if (size > 2 && (have_[2] & 0xc0) != 0x80)
return false;
if (size > 1 &&
((have_[1] & 0xc0) != 0x80 ||
(have_[0] == 240 && have_[1] < 144) ||