Skip to content

J
json
Unverified Commit b9f31494 by Niels Lohmann
Options

🚑 fix for #452

parent 82fb6137
Showing with 119 additions and 63 deletions
src/json.hpp
......@@ -9883,22 +9883,32 @@ basic_json_parser_12:
basic_json_parser_13:
yyaccept = 1;
yych = *(m_marker = ++m_cursor);
if (yych <= 'D')
if (yych <= '9')
{
if (yych == '.')
{
goto basic_json_parser_47;
}
if (yych >= '0')
{
goto basic_json_parser_48;
}
}
else
{
if (yych <= 'E')
{
goto basic_json_parser_48;
if (yych >= 'E')
{
goto basic_json_parser_51;
}
}
if (yych == 'e')
else
{
goto basic_json_parser_48;
if (yych == 'e')
{
goto basic_json_parser_51;
}
}
}
basic_json_parser_14:
......@@ -9930,11 +9940,11 @@ basic_json_parser_15:
{
if (yych <= 'E')
{
goto basic_json_parser_48;
goto basic_json_parser_51;
}
if (yych == 'e')
{
goto basic_json_parser_48;
goto basic_json_parser_51;
}
goto basic_json_parser_14;
}
......@@ -9961,7 +9971,7 @@ basic_json_parser_23:
yych = *(m_marker = ++m_cursor);
if (yych == 'a')
{
goto basic_json_parser_49;
goto basic_json_parser_52;
}
goto basic_json_parser_5;
basic_json_parser_24:
......@@ -9969,7 +9979,7 @@ basic_json_parser_24:
yych = *(m_marker = ++m_cursor);
if (yych == 'u')
{
goto basic_json_parser_50;
goto basic_json_parser_53;
}
goto basic_json_parser_5;
basic_json_parser_25:
......@@ -9977,7 +9987,7 @@ basic_json_parser_25:
yych = *(m_marker = ++m_cursor);
if (yych == 'r')
{
goto basic_json_parser_51;
goto basic_json_parser_54;
}
goto basic_json_parser_5;
basic_json_parser_26:
......@@ -10078,7 +10088,7 @@ basic_json_parser_32:
}
else
{
goto basic_json_parser_55;
goto basic_json_parser_58;
}
}
basic_json_parser_33:
......@@ -10160,7 +10170,7 @@ basic_json_parser_35:
}
if (yych <= 'u')
{
goto basic_json_parser_52;
goto basic_json_parser_55;
}
goto basic_json_parser_32;
}
......@@ -10281,22 +10291,32 @@ basic_json_parser_42:
basic_json_parser_43:
yyaccept = 2;
yych = *(m_marker = ++m_cursor);
if (yych <= 'D')
if (yych <= '9')
{
if (yych == '.')
{
goto basic_json_parser_47;
}
if (yych >= '0')
{
goto basic_json_parser_48;
}
}
else
{
if (yych <= 'E')
{
goto basic_json_parser_48;
if (yych >= 'E')
{
goto basic_json_parser_51;
}
}
if (yych == 'e')
else
{
goto basic_json_parser_48;
if (yych == 'e')
{
goto basic_json_parser_51;
}
}
}
basic_json_parser_44:
......@@ -10332,13 +10352,13 @@ basic_json_parser_45:
{
goto basic_json_parser_44;
}
goto basic_json_parser_48;
goto basic_json_parser_51;
}
else
{
if (yych == 'e')
{
goto basic_json_parser_48;
goto basic_json_parser_51;
}
goto basic_json_parser_44;
}
......@@ -10351,16 +10371,36 @@ basic_json_parser_47:
}
if (yych <= '9')
{
goto basic_json_parser_53;
goto basic_json_parser_56;
}
goto basic_json_parser_32;
basic_json_parser_48:
++m_cursor;
if (m_limit <= m_cursor)
{
fill_line_buffer(1); // LCOV_EXCL_LINE
}
yych = *m_cursor;
if (yych <= '/')
{
goto basic_json_parser_50;
}
if (yych <= '9')
{
goto basic_json_parser_48;
}
basic_json_parser_50:
{
last_token_type = token_type::parse_error;
break;
}
basic_json_parser_51:
yych = *++m_cursor;
if (yych <= ',')
{
if (yych == '+')
{
goto basic_json_parser_56;
goto basic_json_parser_59;
}
goto basic_json_parser_32;
}
......@@ -10368,7 +10408,7 @@ basic_json_parser_48:
{
if (yych <= '-')
{
goto basic_json_parser_56;
goto basic_json_parser_59;
}
if (yych <= '/')
{
......@@ -10376,32 +10416,32 @@ basic_json_parser_48:
}
if (yych <= '9')
{
goto basic_json_parser_57;
goto basic_json_parser_60;
}
goto basic_json_parser_32;
}
basic_json_parser_49:
basic_json_parser_52:
yych = *++m_cursor;
if (yych == 'l')
{
goto basic_json_parser_59;
goto basic_json_parser_62;
}
goto basic_json_parser_32;
basic_json_parser_50:
basic_json_parser_53:
yych = *++m_cursor;
if (yych == 'l')
{
goto basic_json_parser_60;
goto basic_json_parser_63;
}
goto basic_json_parser_32;
basic_json_parser_51:
basic_json_parser_54:
yych = *++m_cursor;
if (yych == 'u')
{
goto basic_json_parser_61;
goto basic_json_parser_64;
}
goto basic_json_parser_32;
basic_json_parser_52:
basic_json_parser_55:
++m_cursor;
if (m_limit <= m_cursor)
{
......@@ -10416,7 +10456,7 @@ basic_json_parser_52:
}
if (yych <= '9')
{
goto basic_json_parser_62;
goto basic_json_parser_65;
}
goto basic_json_parser_32;
}
......@@ -10424,7 +10464,7 @@ basic_json_parser_52:
{
if (yych <= 'F')
{
goto basic_json_parser_62;
goto basic_json_parser_65;
}
if (yych <= '`')
{
......@@ -10432,11 +10472,11 @@ basic_json_parser_52:
}
if (yych <= 'f')
{
goto basic_json_parser_62;
goto basic_json_parser_65;
}
goto basic_json_parser_32;
}
basic_json_parser_53:
basic_json_parser_56:
yyaccept = 3;
m_marker = ++m_cursor;
if ((m_limit - m_cursor) < 3)
......@@ -10448,30 +10488,30 @@ basic_json_parser_53:
{
if (yych <= '/')
{
goto basic_json_parser_55;
goto basic_json_parser_58;
}
if (yych <= '9')
{
goto basic_json_parser_53;
goto basic_json_parser_56;
}
}
else
{
if (yych <= 'E')
{
goto basic_json_parser_48;
goto basic_json_parser_51;
}
if (yych == 'e')
{
goto basic_json_parser_48;
goto basic_json_parser_51;
}
}
basic_json_parser_55:
basic_json_parser_58:
{
last_token_type = token_type::value_float;
break;
}
basic_json_parser_56:
basic_json_parser_59:
yych = *++m_cursor;
if (yych <= '/')
{
......@@ -10481,7 +10521,7 @@ basic_json_parser_56:
{
goto basic_json_parser_32;
}
basic_json_parser_57:
basic_json_parser_60:
++m_cursor;
if (m_limit <= m_cursor)
{
......@@ -10490,35 +10530,35 @@ basic_json_parser_57:
yych = *m_cursor;
if (yych <= '/')
{
goto basic_json_parser_55;
goto basic_json_parser_58;
}
if (yych <= '9')
{
goto basic_json_parser_57;
goto basic_json_parser_60;
}
goto basic_json_parser_55;
basic_json_parser_59:
goto basic_json_parser_58;
basic_json_parser_62:
yych = *++m_cursor;
if (yych == 's')
{
goto basic_json_parser_63;
goto basic_json_parser_66;
}
goto basic_json_parser_32;
basic_json_parser_60:
basic_json_parser_63:
yych = *++m_cursor;
if (yych == 'l')
{
goto basic_json_parser_64;
goto basic_json_parser_67;
}
goto basic_json_parser_32;
basic_json_parser_61:
basic_json_parser_64:
yych = *++m_cursor;
if (yych == 'e')
{
goto basic_json_parser_66;
goto basic_json_parser_69;
}
goto basic_json_parser_32;
basic_json_parser_62:
basic_json_parser_65:
++m_cursor;
if (m_limit <= m_cursor)
{
......@@ -10533,7 +10573,7 @@ basic_json_parser_62:
}
if (yych <= '9')
{
goto basic_json_parser_68;
goto basic_json_parser_71;
}
goto basic_json_parser_32;
}
......@@ -10541,7 +10581,7 @@ basic_json_parser_62:
{
if (yych <= 'F')
{
goto basic_json_parser_68;
goto basic_json_parser_71;
}
if (yych <= '`')
{
......@@ -10549,30 +10589,30 @@ basic_json_parser_62:
}
if (yych <= 'f')
{
goto basic_json_parser_68;
goto basic_json_parser_71;
}
goto basic_json_parser_32;
}
basic_json_parser_63:
basic_json_parser_66:
yych = *++m_cursor;
if (yych == 'e')
{
goto basic_json_parser_69;
goto basic_json_parser_72;
}
goto basic_json_parser_32;
basic_json_parser_64:
basic_json_parser_67:
++m_cursor;
{
last_token_type = token_type::literal_null;
break;
}
basic_json_parser_66:
basic_json_parser_69:
++m_cursor;
{
last_token_type = token_type::literal_true;
break;
}
basic_json_parser_68:
basic_json_parser_71:
++m_cursor;
if (m_limit <= m_cursor)
{
......@@ -10587,7 +10627,7 @@ basic_json_parser_68:
}
if (yych <= '9')
{
goto basic_json_parser_71;
goto basic_json_parser_74;
}
goto basic_json_parser_32;
}
......@@ -10595,7 +10635,7 @@ basic_json_parser_68:
{
if (yych <= 'F')
{
goto basic_json_parser_71;
goto basic_json_parser_74;
}
if (yych <= '`')
{
......@@ -10603,17 +10643,17 @@ basic_json_parser_68:
}
if (yych <= 'f')
{
goto basic_json_parser_71;
goto basic_json_parser_74;
}
goto basic_json_parser_32;
}
basic_json_parser_69:
basic_json_parser_72:
++m_cursor;
{
last_token_type = token_type::literal_false;
break;
}
basic_json_parser_71:
basic_json_parser_74:
++m_cursor;
if (m_limit <= m_cursor)
{
......
src/json.hpp.re2c
......@@ -9698,6 +9698,8 @@ class basic_json
exp = e (minus | plus)? digit+;
frac = decimal_point digit+;
int = (zero | digit_1_9 digit*);
invalid_int = minus? "0" digit+;
invalid_int { last_token_type = token_type::parse_error; break; }
number_unsigned = int;
number_unsigned { last_token_type = token_type::value_unsigned; break; }
number_integer = minus int;
......
test/src/unit-class_parser.cpp
......@@ -299,7 +299,9 @@ TEST_CASE("parser class")
CHECK_THROWS_AS(json::parser("+0").parse(), std::invalid_argument);
CHECK_THROWS_WITH(json::parser("01").parse(),
"parse error - unexpected number literal");
"parse error - unexpected '01'");
CHECK_THROWS_WITH(json::parser("-01").parse(),
"parse error - unexpected '-01'");
CHECK_THROWS_WITH(json::parser("--1").parse(), "parse error - unexpected '-'");
CHECK_THROWS_WITH(json::parser("1.").parse(),
"parse error - unexpected '.'; expected end of input");
......
test/src/unit-regression.cpp
......@@ -724,4 +724,16 @@ TEST_CASE("regression tests")
};
CHECK_THROWS_AS(json::from_cbor(vec2), std::out_of_range);
}
SECTION("issue #452 - Heap-buffer-overflow (OSS-Fuzz issue 585)")
{
std::vector<uint8_t> vec = {'-', '0', '1', '2', '2', '7', '4'};
CHECK_THROWS_AS(json::parse(vec), std::invalid_argument);
}
//SECTION("issue #454 - doubles are printed as integers")
//{
// json j = R"({"bool_value":true,"double_value":2.0,"int_value":10,"level1":{"list_value":[3,"hi",false],"tmp":5.0},"string_value":"hello"})"_json;
// CHECK(j["double_value"].is_number_integer());
//}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment