2
1
mirror of https://github.com/qpdf/qpdf.git synced 2024-12-22 10:58:58 +00:00

Detect end of input inside an unfinished JSON string

This commit is contained in:
Jay Berkenbilt 2024-02-06 15:30:29 -05:00
parent 3490090fbc
commit b1b789df42
4 changed files with 11 additions and 3 deletions

View File

@ -0,0 +1 @@
{"qpdf":[{},{"obj:1 0 R":{"stream":{"data":"

View File

@ -16,7 +16,7 @@ my @fuzzers = (
['dct' => 1],
['flate' => 1],
['hex' => 1],
['json' => 39],
['json' => 40],
['lzw' => 2],
['pngpredictor' => 1],
['runlength' => 6],

View File

@ -628,6 +628,7 @@ namespace
ls_number_e_sign,
ls_alpha,
ls_string,
ls_after_string,
ls_backslash,
ls_u4,
ls_begin_array,
@ -1039,7 +1040,7 @@ JSONParser::getToken()
"JSON: offset " + std::to_string(high_offset) +
": UTF-16 high surrogate not followed by low surrogate");
}
ignore();
ignore(ls_after_string);
return;
} else if (*p == '\\') {
ignore(ls_backslash);
@ -1234,7 +1235,7 @@ JSONParser::handleToken()
}
break;
case ls_string:
case ls_after_string:
if (parser_state == ps_dict_begin || parser_state == ps_dict_after_comma) {
dict_key = token;
dict_key_offset = token_start;

View File

@ -134,6 +134,12 @@ test_main()
" \"normal\": \"string\"\n"
"}");
try {
JSON::parse("\"");
assert(false);
} catch (std::runtime_error&) {
}
// Check default constructed JSON object (order as per JSON.hh).
JSON uninitialized;
std::string ws;