j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

✅ improved test coverage

Browse source 
As we guarantee proper UTF-8 before, we do not need to cope with it later.
This commit is contained in:
Niels Lohmann 2017-12-12 20:44:57 +01:00
parent 569d275f65
commit 8419bfbbd2
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
3 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/json.hpp
View file

@ -6415,12 +6415,8 @@ class serializer
if (ensure_ascii and (s[i] & 0x80 or s[i] == 0x7F)) if (ensure_ascii and (s[i] & 0x80 or s[i] == 0x7F))
{ {
const auto bytes = bytes_following(static_cast<uint8_t>(s[i])); const auto bytes = bytes_following(static_cast<uint8_t>(s[i]));
if (bytes == std::string::npos) // invalid characters will be detected by throw_if_invalid_utf8
{ assert (bytes != std::string::npos);
// invalid characters are treated as is, so no
// additional space will be used
break;
}
if (bytes == 3) if (bytes == 3)
{ {
@ -6588,12 +6584,8 @@ class serializer
(ensure_ascii and (s[i] & 0x80 or s[i] == 0x7F))) (ensure_ascii and (s[i] & 0x80 or s[i] == 0x7F)))
{ {
const auto bytes = bytes_following(static_cast<uint8_t>(s[i])); const auto bytes = bytes_following(static_cast<uint8_t>(s[i]));
if (bytes == std::string::npos) // invalid characters will be detected by throw_if_invalid_utf8
{ assert (bytes != std::string::npos);
// copy invalid character as is
result[pos++] = s[i];
break;
}
// check that the additional bytes are present // check that the additional bytes are present
assert(i + bytes < s.size()); assert(i + bytes < s.size());