AuroraMiddleware/nlohmannjson
1
0
Fork 0
mirror of https://github.com/nlohmann/json synced 2024-12-25 18:11:05 +00:00
Code Issues Releases Wiki Activity

Merge pull request #146 from robertmrk/surrogate-pair-parsing-fix

Browse Source 
Fix character skipping after a surrogate pair
This commit is contained in:
Niels 2015-11-14 08:22:04 +01:00
commit c013223276
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/json.hpp
View File

@ -6856,8 +6856,8 @@ basic_json_parser_59:
auto codepoint2 = std::strtoul(std::string(reinterpret_cast<typename string_t::const_pointer>
(i + 7), 4).c_str(), nullptr, 16);
result += to_unicode(codepoint, codepoint2);
// skip the next 11 characters (xxxx\uyyyy)
i += 11;
// skip the next 10 characters (xxxx\uyyyy)
i += 10;
}
else
{

4
src/json.hpp.re2c
View File

@ -6162,8 +6162,8 @@ class basic_json
auto codepoint2 = std::strtoul(std::string(reinterpret_cast<typename string_t::const_pointer>
(i + 7), 4).c_str(), nullptr, 16);
result += to_unicode(codepoint, codepoint2);
// skip the next 11 characters (xxxx\uyyyy)
i += 11;
// skip the next 10 characters (xxxx\uyyyy)
i += 10;
}
else
{

5
test/unit.cpp
View File

@ -10205,4 +10205,9 @@ TEST_CASE("regression tests")
j["string"] = bytes;
CHECK(j["string"] == "\u0007\u0007");
}
SECTION("character following a surrogate pair is skipped")
{
CHECK(json::parse("\"\\ud80c\\udc60abc\"").get<json::string_t>() == u8"\U00013060abc");
}
}