From 7edf71414faaf19d711086bd3969a993b96346b3 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Tue, 31 Mar 2020 22:37:43 +1100 Subject: [PATCH] Fix std/json replace_invalid_unicode copy/pasto Updates https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=21465 --- release/c/wuffs-unsupported-snapshot.c | 2 +- std/json/decode_json.wuffs | 2 +- test/data/json-quirks.tokens | Bin 960 -> 960 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 82628138..e139fb57 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -21578,7 +21578,7 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, (((uint64_t)(6356989)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | (((uint64_t)(3)) << WUFFS_BASE__TOKEN__LINK__SHIFT) | - (((uint64_t)(6)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); + (((uint64_t)(10)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); goto label__string_loop_outer__continue; } } else if ((v_c == 120) && diff --git a/std/json/decode_json.wuffs b/std/json/decode_json.wuffs index ddae591c..f2465fda 100644 --- a/std/json/decode_json.wuffs +++ b/std/json/decode_json.wuffs @@ -560,7 +560,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor value_major: 0, value_minor: 0x60_FFFD, link: 0x3, - length: 6) + length: 10) continue.string_loop_outer } // -------- END backslash-capital-u. diff --git a/test/data/json-quirks.tokens b/test/data/json-quirks.tokens index d9a82968b9a2c6b9160a14da9f218dd09d269463..d8feab9d72b3bdf76d7d1659794384e556cf1e0b 100644 GIT binary patch delta 260 zcmX@Wet><$QKot>Mn(n(1_ow^|9=@67?l|qA$%qV21N!2MimAKmw}0aL70JoQJp~$ zq#BGF85kHX8Nj+37#JB8oER7wZ5bFLB2e{qXy(~7a6k-XVqj=sU|@8wK~vy?W}y$7 ifxZmPa05UN41no}dLWR26Gc7>&AeEM^FR(3PyztxK@M*K delta 260 zcmX@Wet><$QKot}Mn(n(1_ow^|9=@6808rlA$%qV21N!2Mg;~4mw}0aL70JoQJFyy zq#BGF85kH%8Nj+37#JB8oER7wEg2XgB2e{KXy#cna6k-XVqj=sU|@8vK~vy@W}yd~ ifu0P^a05UN^nvMzdcc=~6Gc7@&Adp6^FR(3PyztP