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

fixed Valgrind error

Browse source
This commit is contained in:
Niels 2015-02-15 17:07:19 +01:00
parent f1f72403cd
commit 9f87fd464a
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/json.hpp
View file

@ -3422,6 +3422,12 @@ basic_json_parser_59:
if (codepoint >= 0xD800 and codepoint <= 0xDBFF)
{
// make sure there is a subsequent unicode
if (m_cursor - i < 11 and * (i + 5) == '\\' and * (i + 6) == 'u')
{
throw std::invalid_argument("missing low surrogate");
}
// get code yyyy from uxxxx\uyyyy
auto codepoint2 = std::strtoul(std::string(i + 7, 4).c_str(), nullptr, 16);
result += to_unicode(codepoint, codepoint2);

6
src/json.hpp.re2c
View file

@ -2771,6 +2771,12 @@ class basic_json
if (codepoint >= 0xD800 and codepoint <= 0xDBFF)
{
// make sure there is a subsequent unicode
if (m_cursor - i < 11 and * (i + 5) == '\\' and * (i + 6) == 'u')
{
throw std::invalid_argument("missing low surrogate");
}
// get code yyyy from uxxxx\uyyyy
auto codepoint2 = std::strtoul(std::string(i + 7, 4).c_str(), nullptr, 16);
result += to_unicode(codepoint, codepoint2);