fix of the fix

This commit is contained in:
Niels 2015-02-15 17:40:46 +01:00
parent 9f87fd464a
commit d31d1ca664
2 changed files with 2 additions and 2 deletions

View file

@ -3423,7 +3423,7 @@ basic_json_parser_59:
if (codepoint >= 0xD800 and codepoint <= 0xDBFF) if (codepoint >= 0xD800 and codepoint <= 0xDBFF)
{ {
// make sure there is a subsequent unicode // make sure there is a subsequent unicode
if (m_cursor - i < 11 and * (i + 5) == '\\' and * (i + 6) == 'u') if ((i + 6 >= m_limit) or * (i + 5) != '\\' or * (i + 6) != 'u')
{ {
throw std::invalid_argument("missing low surrogate"); throw std::invalid_argument("missing low surrogate");
} }

View file

@ -2772,7 +2772,7 @@ class basic_json
if (codepoint >= 0xD800 and codepoint <= 0xDBFF) if (codepoint >= 0xD800 and codepoint <= 0xDBFF)
{ {
// make sure there is a subsequent unicode // make sure there is a subsequent unicode
if (m_cursor - i < 11 and * (i + 5) == '\\' and * (i + 6) == 'u') if ((i + 6 >= m_limit) or * (i + 5) != '\\' or * (i + 6) != 'u')
{ {
throw std::invalid_argument("missing low surrogate"); throw std::invalid_argument("missing low surrogate");
} }