octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2024-12-22 19:08:59 +00:00
Code Issues Releases Wiki Activity

In JSONParser::handleToken move processing for ls_colon and ls_comma into switch statement

Browse Source
This commit is contained in:
m-holger 2023-01-27 12:26:27 +00:00
parent 4dba3c95dd
commit a7338ab15a
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libqpdf/JSON.cc
View File

@ -1156,7 +1156,9 @@ JSONParser::handleToken()
"JSON: offset " + std::to_string(offset) + "JSON: offset " + std::to_string(offset) +
": unexpected colon"); ": unexpected colon");
} }
break; parser_state = ps_dict_after_colon;
lex_state = ls_top;
return;
case ls_comma: case ls_comma:
if (!((parser_state == ps_dict_after_item) || if (!((parser_state == ps_dict_after_item) ||
@ -1166,7 +1168,16 @@ JSONParser::handleToken()
"JSON: offset " + std::to_string(offset) + "JSON: offset " + std::to_string(offset) +
": unexpected comma"); ": unexpected comma");
} }
break; if (parser_state == ps_dict_after_item) {
parser_state = ps_dict_after_comma;
} else if (parser_state == ps_array_after_item) {
parser_state = ps_array_after_comma;
} else {
throw std::logic_error("JSONParser::handleToken: unexpected parser"
" state for comma");
}
lex_state = ls_top;
return;
case ls_end_array: case ls_end_array:
if (!((parser_state == ps_array_begin) || if (!((parser_state == ps_array_begin) ||
@ -1275,18 +1286,7 @@ JSONParser::handleToken()
// whatever we need to do with it. // whatever we need to do with it.
parser_state_e next_state = ps_top; parser_state_e next_state = ps_top;
if (lex_state == ls_colon) { if ((lex_state == ls_end_array) || (lex_state == ls_end_dict)) {
next_state = ps_dict_after_colon;
} else if (lex_state == ls_comma) {
if (parser_state == ps_dict_after_item) {
next_state = ps_dict_after_comma;
} else if (parser_state == ps_array_after_item) {
next_state = ps_array_after_comma;
} else {
throw std::logic_error("JSONParser::handleToken: unexpected parser"
" state for comma");
}
} else if ((lex_state == ls_end_array) || (lex_state == ls_end_dict)) {
next_state = ps_stack.back(); next_state = ps_stack.back();
ps_stack.pop_back(); ps_stack.pop_back();
auto tos = stack.back(); auto tos = stack.back();
@ -1348,9 +1348,6 @@ JSONParser::handleToken()
throw std::logic_error( throw std::logic_error(
"JSONParser::handleToken: unexpected parser state"); "JSONParser::handleToken: unexpected parser state");
} }
} else {
throw std::logic_error(
"JSONParser::handleToken: unexpected null item in transition");
} }
if (reactor && item.get()) { if (reactor && item.get()) {