Raise json.DECODER_NUMBER_LENGTH_MAX_INCL to 2047

This commit is contained in:
Nigel Tao committed 2020-07-07 23:08:11 +10:00
1 parent 2a7e1ed175
commit b9f69264a0
4 files changed
+87 -84

No files matched your search

+26 -26
View File
@@ -6995,7 +6995,7 @@ extern const char wuffs_json__error__unsupported_recursion_depth[];
#define WUFFS_JSON__DECODER_DST_TOKEN_BUFFER_LENGTH_MIN_INCL 1
#define WUFFS_JSON__DECODER_SRC_IO_BUFFER_LENGTH_MIN_INCL 100
#define WUFFS_JSON__DECODER_SRC_IO_BUFFER_LENGTH_MIN_INCL 2048
#define WUFFS_JSON__QUIRK_ALLOW_ASCII_CONTROL_CODES 1225364480
@@ -23250,7 +23250,7 @@ const char wuffs_json__error__internal_error_inconsistent_i_o[] = "#json: intern
// ---------------- Private Consts
#define WUFFS_JSON__DECODER_NUMBER_LENGTH_MAX_INCL 99
#define WUFFS_JSON__DECODER_NUMBER_LENGTH_MAX_INCL 2047
static const uint8_t
WUFFS_JSON__LUT_BACKSLASHES[256]WUFFS_BASE__POTENTIALLY_UNUSED = {
@@ -24375,12 +24375,12 @@ wuffs_json__decoder__decode_tokens(
if (a_src) {
iop_a_src = a_src->data.ptr + a_src->meta.ri;
}
v_number_status = (v_number_length >> 8);
v_number_status = (v_number_length >> 12);
v_vminor = 10486787;
if ((v_number_length & 128) != 0) {
if ((v_number_length & 2048) != 0) {
v_vminor = 10486785;
}
v_number_length = (v_number_length & 127);
v_number_length = (v_number_length & 2047);
if (v_number_status == 0) {
*iop_a_dst++ = wuffs_base__make_token(
(((uint64_t)(v_vminor)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
@@ -24707,7 +24707,7 @@ wuffs_json__decoder__decode_number(
v_n = 0;
if (((uint64_t)(io2_a_src - iop_a_src)) <= 0) {
if ( ! (a_src && a_src->meta.closed)) {
v_n |= 768;
v_n |= 12288;
}
goto label__goto_done__break;
}
@@ -24718,9 +24718,9 @@ wuffs_json__decoder__decode_number(
(iop_a_src += 1, wuffs_base__make_empty_struct());
if (((uint64_t)(io2_a_src - iop_a_src)) <= 0) {
if ( ! (a_src && a_src->meta.closed)) {
v_n |= 768;
v_n |= 12288;
}
v_n |= 256;
v_n |= 4096;
goto label__goto_done__break;
}
v_c = wuffs_base__load_u8be__no_bounds_check(iop_a_src);
@@ -24736,26 +24736,26 @@ wuffs_json__decoder__decode_number(
if (a_src) {
iop_a_src = a_src->data.ptr + a_src->meta.ri;
}
if (v_n > 99) {
if (v_n > 2047) {
goto label__goto_done__break;
}
}
if (((uint64_t)(io2_a_src - iop_a_src)) <= 0) {
if ( ! (a_src && a_src->meta.closed)) {
v_n |= 768;
v_n |= 12288;
}
goto label__goto_done__break;
}
v_c = wuffs_base__load_u8be__no_bounds_check(iop_a_src);
if (v_c != 46) {
} else {
if (v_n >= 99) {
v_n |= 512;
if (v_n >= 2047) {
v_n |= 8192;
goto label__goto_done__break;
}
v_n += 1;
(iop_a_src += 1, wuffs_base__make_empty_struct());
v_floating_point = 128;
v_floating_point = 2048;
if (a_src) {
a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
}
@@ -24763,12 +24763,12 @@ wuffs_json__decoder__decode_number(
if (a_src) {
iop_a_src = a_src->data.ptr + a_src->meta.ri;
}
if (v_n > 99) {
if (v_n > 2047) {
goto label__goto_done__break;
}
if (((uint64_t)(io2_a_src - iop_a_src)) <= 0) {
if ( ! (a_src && a_src->meta.closed)) {
v_n |= 768;
v_n |= 12288;
}
goto label__goto_done__break;
}
@@ -24777,25 +24777,25 @@ wuffs_json__decoder__decode_number(
if ((v_c != 69) && (v_c != 101)) {
goto label__goto_done__break;
}
if (v_n >= 99) {
v_n |= 512;
if (v_n >= 2047) {
v_n |= 8192;
goto label__goto_done__break;
}
v_n += 1;
(iop_a_src += 1, wuffs_base__make_empty_struct());
v_floating_point = 128;
v_floating_point = 2048;
if (((uint64_t)(io2_a_src - iop_a_src)) <= 0) {
if ( ! (a_src && a_src->meta.closed)) {
v_n |= 768;
v_n |= 12288;
}
v_n |= 256;
v_n |= 4096;
goto label__goto_done__break;
}
v_c = wuffs_base__load_u8be__no_bounds_check(iop_a_src);
if ((v_c != 43) && (v_c != 45)) {
} else {
if (v_n >= 99) {
v_n |= 512;
if (v_n >= 2047) {
v_n |= 8192;
goto label__goto_done__break;
}
v_n += 1;
@@ -24842,7 +24842,7 @@ wuffs_json__decoder__decode_digits(
while (true) {
if (((uint64_t)(io2_a_src - iop_a_src)) <= 0) {
if ( ! (a_src && a_src->meta.closed)) {
v_n |= 768;
v_n |= 12288;
}
goto label__0__break;
}
@@ -24850,8 +24850,8 @@ wuffs_json__decoder__decode_digits(
if (0 == WUFFS_JSON__LUT_DECIMAL_DIGITS[v_c]) {
goto label__0__break;
}
if (v_n >= 99) {
v_n |= 512;
if (v_n >= 2047) {
v_n |= 8192;
goto label__0__break;
}
v_n += 1;
@@ -24859,7 +24859,7 @@ wuffs_json__decoder__decode_digits(
}
label__0__break:;
if (v_n == a_n) {
v_n |= 256;
v_n |= 4096;
}
if (a_src) {
a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));