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 add lex_state ls_number_e

Browse Source 
Also, allow 'E' as alternative to 'e'.
This commit is contained in:
m-holger 2023-01-24 01:36:38 +00:00
parent 972ebca505
commit 04333bbc20
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libqpdf/JSON.cc
View File

@ -652,6 +652,7 @@ namespace
ls_number_before_point, ls_number_before_point,
ls_number_point, ls_number_point,
ls_number_after_point, ls_number_after_point,
ls_number_e,
ls_alpha, ls_alpha,
ls_string, ls_string,
ls_backslash, ls_backslash,
@ -817,7 +818,7 @@ JSONParser::numberError()
"JSON: offset " + std::to_string(offset) + "JSON: offset " + std::to_string(offset) +
": numeric literal: decimal point already seen"); ": numeric literal: decimal point already seen");
} }
} else if (*p == 'e') { } else if (*p == 'e' || *p == 'E') {
// QTC::TC("libtests", "JSON parse duplicate e"); // QTC::TC("libtests", "JSON parse duplicate e");
throw std::runtime_error( throw std::runtime_error(
"JSON: offset " + std::to_string(offset) + "JSON: offset " + std::to_string(offset) +
@ -919,14 +920,15 @@ JSONParser::getToken()
case ls_number_leading_zero: case ls_number_leading_zero:
if (*p == '.') { if (*p == '.') {
lex_state = ls_number_point; lex_state = ls_number_point;
} else if (*p == 'e') {
lex_state = ls_number;
} else if (QUtil::is_space(*p)) { } else if (QUtil::is_space(*p)) {
action = ignore; action = ignore;
ready = true; ready = true;
} else if (strchr("{}[]:,", *p)) { } else if (strchr("{}[]:,", *p)) {
action = reread; action = reread;
ready = true; ready = true;
} else if (*p == 'e' || *p == 'E') {
number_saw_e = true;
lex_state = ls_number_e;
} else { } else {
QTC::TC("libtests", "JSON parse leading zero"); QTC::TC("libtests", "JSON parse leading zero");
throw std::runtime_error( throw std::runtime_error(
@ -941,15 +943,15 @@ JSONParser::getToken()
} else if (*p == '.') { } else if (*p == '.') {
number_saw_point = true; number_saw_point = true;
lex_state = ls_number_point; lex_state = ls_number_point;
} else if (*p == 'e') {
number_saw_e = true;
lex_state = ls_number;
} else if (QUtil::is_space(*p)) { } else if (QUtil::is_space(*p)) {
action = ignore; action = ignore;
ready = true; ready = true;
} else if (strchr("{}[]:,", *p)) { } else if (strchr("{}[]:,", *p)) {
action = reread; action = reread;
ready = true; ready = true;
} else if (*p == 'e' || *p == 'E') {
number_saw_e = true;
lex_state = ls_number_e;
} else { } else {
numberError(); numberError();
} }
@ -967,15 +969,26 @@ JSONParser::getToken()
case ls_number_after_point: case ls_number_after_point:
if ((*p >= '0') && (*p <= '9')) { if ((*p >= '0') && (*p <= '9')) {
++number_after_point; ++number_after_point;
} else if (*p == 'e') {
number_saw_e = true;
lex_state = ls_number;
} else if (QUtil::is_space(*p)) { } else if (QUtil::is_space(*p)) {
action = ignore; action = ignore;
ready = true; ready = true;
} else if (strchr("{}[]:,", *p)) { } else if (strchr("{}[]:,", *p)) {
action = reread; action = reread;
ready = true; ready = true;
} else if (*p == 'e' || *p == 'E') {
number_saw_e = true;
lex_state = ls_number_e;
} else {
numberError();
}
break;
case ls_number_e:
if ((*p >= '0') && (*p <= '9')) {
++number_after_e;
lex_state = ls_number;
} else if ((*p == '+') || (*p == '-')) {
lex_state = ls_number;
} else { } else {
numberError(); numberError();
} }
@ -1003,7 +1016,7 @@ JSONParser::getToken()
} else { } else {
number_saw_point = true; number_saw_point = true;
} }
} else if (*p == 'e') { } else if (*p == 'e' || *p == 'E') {
if (number_saw_e) { if (number_saw_e) {
QTC::TC("libtests", "JSON parse duplicate e"); QTC::TC("libtests", "JSON parse duplicate e");
throw std::runtime_error( throw std::runtime_error(
@ -1110,6 +1123,7 @@ JSONParser::getToken()
case ls_number_before_point: case ls_number_before_point:
case ls_number_point: case ls_number_point:
case ls_number_after_point: case ls_number_after_point:
case ls_number_e:
case ls_number: case ls_number:
case ls_number_minus: case ls_number_minus:
case ls_number_leading_zero: case ls_number_leading_zero:
@ -1191,6 +1205,7 @@ JSONParser::handleToken()
case ls_number_before_point: case ls_number_before_point:
case ls_number_point: case ls_number_point:
case ls_number_after_point: case ls_number_after_point:
case ls_number_e:
if (number_saw_point && (number_after_point == 0)) { if (number_saw_point && (number_after_point == 0)) {
// QTC::TC("libtests", "JSON parse decimal with no digits"); // QTC::TC("libtests", "JSON parse decimal with no digits");
throw std::runtime_error( throw std::runtime_error(