boostorg/beast
1
0
Fork 1
mirror of https://github.com/boostorg/beast.git synced 2025-08-03 06:44:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Increase utf8 checker code coverage

Browse Source
This commit is contained in:
Miguel Portilla
2016-11-14 17:21:42 -05: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

10
include/beast/websocket/detail/utf8_checker.hpp
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] & 0x60) == 0x40)
{ {
if ((in[0] & 0xfe) == 0xc0 || if ((in[1] & 0xc0) != 0x80)
(in[1] & 0xc0) != 0x80) return false;
return false;
in += 2; in += 2;
return true; return true;
} }
@@ -200,9 +199,8 @@ utf8_checker_t<_>::write(std::uint8_t const* in, std::size_t size)
if ((have_[0] & 0xf8) == 0xf0) if ((have_[0] & 0xf8) == 0xf0)
{ {
auto const size = p_ - have_; auto const size = p_ - have_;
if (have_[0] > 244 || if (size > 2 && (have_[2] & 0xc0) != 0x80)
(size > 2 && (have_[2] & 0xc0) != 0x80)) return false;
return false;
if (size > 1 && if (size > 1 &&
((have_[1] & 0xc0) != 0x80 || ((have_[1] & 0xc0) != 0x80 ||
(have_[0] == 240 && have_[1] < 144) || (have_[0] == 240 && have_[1] < 144) ||

93
test/websocket/utf8_checker.cpp
View File

@@ -115,6 +115,47 @@ public:
buf[2] = static_cast<std::uint8_t>(k); buf[2] = static_cast<std::uint8_t>(k);
BEAST_EXPECT(utf8.write(buf, 3)); BEAST_EXPECT(utf8.write(buf, 3));
BEAST_EXPECT(utf8.finish()); BEAST_EXPECT(utf8.finish());
// Segmented sequence
BEAST_EXPECT(utf8.write(buf, 1));
BEAST_EXPECT(utf8.write(&buf[1], 2));
utf8.reset();
// Segmented sequence
BEAST_EXPECT(utf8.write(buf, 2));
BEAST_EXPECT(utf8.write(&buf[2], 1));
utf8.reset();
if (i == 224)
{
for (auto l = 0; l < b; ++l)
{
// Second byte invalid range 0-127 or 0-159
buf[1] = static_cast<std::uint8_t>(l);
BEAST_EXPECT(! utf8.write(buf, 3));
if (l > 127)
{
// Segmented sequence second byte invalid
BEAST_EXPECT(! utf8.write(buf, 2));
utf8.reset();
}
}
buf[1] = static_cast<std::uint8_t>(j);
}
else if (i == 237)
{
for (auto l = e + 1; l <= 255; ++l)
{
// Second byte invalid range 160-255 or 192-255
buf[1] = static_cast<std::uint8_t>(l);
BEAST_EXPECT(!utf8.write(buf, 3));
if (l > 159)
{
// Segmented sequence second byte invalid
BEAST_EXPECT(! utf8.write(buf, 2));
utf8.reset();
}
}
buf[1] = static_cast<std::uint8_t>(j);
}
} }
for(auto k = 0; k <= 127; ++k) for(auto k = 0; k <= 127; ++k)
@@ -187,6 +228,51 @@ public:
buf[3] = static_cast<std::uint8_t>(n); buf[3] = static_cast<std::uint8_t>(n);
BEAST_EXPECT(utf8.write(const_buffers_1{buf, 4})); BEAST_EXPECT(utf8.write(const_buffers_1{buf, 4}));
BEAST_EXPECT(utf8.finish()); BEAST_EXPECT(utf8.finish());
// Segmented sequence
BEAST_EXPECT(utf8.write(buf, 1));
BEAST_EXPECT(utf8.write(&buf[1], 3));
utf8.reset();
// Segmented sequence
BEAST_EXPECT(utf8.write(buf, 2));
BEAST_EXPECT(utf8.write(&buf[2], 2));
utf8.reset();
// Segmented sequence
BEAST_EXPECT(utf8.write(buf, 3));
BEAST_EXPECT(utf8.write(&buf[3], 1));
utf8.reset();
if (i == 240)
{
for (auto l = 0; l < b; ++l)
{
// Second byte invalid range 0-127 or 0-143
buf[1] = static_cast<std::uint8_t>(l);
BEAST_EXPECT(! utf8.write(buf, 4));
if (l > 127)
{
// Segmented sequence second byte invalid
BEAST_EXPECT(! utf8.write(buf, 2));
utf8.reset();
}
}
buf[1] = static_cast<std::uint8_t>(j);
}
else if (i == 244)
{
for (auto l = e + 1; l <= 255; ++l)
{
// Second byte invalid range 144-255 or 192-255
buf[1] = static_cast<std::uint8_t>(l);
BEAST_EXPECT(! utf8.write(buf, 4));
if (l > 143)
{
// Segmented sequence second byte invalid
BEAST_EXPECT(! utf8.write(buf, 2));
utf8.reset();
}
}
buf[1] = static_cast<std::uint8_t>(j);
}
} }
for(auto n = 0; n <= 127; ++n) for(auto n = 0; n <= 127; ++n)
@@ -248,6 +334,13 @@ public:
BEAST_EXPECT(! utf8.write(&buf[1], 1)); BEAST_EXPECT(! utf8.write(&buf[1], 1));
utf8.reset(); utf8.reset();
} }
for (auto i = 245; i <= 255; ++i)
{
// First byte invalid range 245-255
buf[0] = static_cast<std::uint8_t>(i);
BEAST_EXPECT(! utf8.write(buf, 4));
}
} }
void void