From 1f3912aadfc87d964303c8f6fba1f5f0ae4916cb Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 20 Aug 2020 11:41:23 +1000 Subject: [PATCH] Fix std/cbor decoding multi-byte 0-length strings Updates https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=25041 --- release/c/wuffs-unsupported-snapshot.c | 26 ++++++++------- std/cbor/decode_cbor.wuffs | 44 ++++++++++++++------------ 2 files changed, 37 insertions(+), 33 deletions(-) diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index ca455186..2392f685 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -17010,12 +17010,13 @@ wuffs_cbor__decoder__decode_tokens( goto label__goto_parsed_a_leaf_value__break; } } else if (v_c_major == 2) { - if (v_c_minor == 0) { - *iop_a_dst++ = wuffs_base__make_token( - (((uint64_t)(4194560)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(1)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); - goto label__goto_parsed_a_leaf_value__break; - } else if (v_c_minor < 28) { + if (v_c_minor < 28) { + if (v_string_length == 0) { + *iop_a_dst++ = wuffs_base__make_token( + (((uint64_t)(4194560)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | + (((uint64_t)(((uint32_t)(WUFFS_CBOR__TOKEN_LENGTHS[v_c_minor])))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); + goto label__goto_parsed_a_leaf_value__break; + } *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(4194560)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | (((uint64_t)(1)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | @@ -17075,12 +17076,13 @@ wuffs_cbor__decoder__decode_tokens( goto label__goto_parsed_a_leaf_value__break; } } else if (v_c_major == 3) { - if (v_c_minor == 0) { - *iop_a_dst++ = wuffs_base__make_token( - (((uint64_t)(4194579)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | - (((uint64_t)(1)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); - goto label__goto_parsed_a_leaf_value__break; - } else if (v_c_minor < 28) { + if (v_c_minor < 28) { + if (v_string_length == 0) { + *iop_a_dst++ = wuffs_base__make_token( + (((uint64_t)(4194579)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | + (((uint64_t)(((uint32_t)(WUFFS_CBOR__TOKEN_LENGTHS[v_c_minor])))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); + goto label__goto_parsed_a_leaf_value__break; + } *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(4194579)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | (((uint64_t)(1)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | diff --git a/std/cbor/decode_cbor.wuffs b/std/cbor/decode_cbor.wuffs index e9da238b..77b1097f 100644 --- a/std/cbor/decode_cbor.wuffs +++ b/std/cbor/decode_cbor.wuffs @@ -294,15 +294,16 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor } else if c_major == 2 { // -------- BEGIN Major type 2: a byte string. - if c_minor == 0x00 { - args.dst.write_simple_token_fast!( - value_major: 0, - value_minor: (base.TOKEN__VBC__STRING << 21) | - base.TOKEN__VBD__STRING__CONVERT_0_DST_1_SRC_DROP, - continued: 0, - length: 1) - break.goto_parsed_a_leaf_value - } else if c_minor < 0x1C { + if c_minor < 0x1C { + if string_length == 0 { + args.dst.write_simple_token_fast!( + value_major: 0, + value_minor: (base.TOKEN__VBC__STRING << 21) | + base.TOKEN__VBD__STRING__CONVERT_0_DST_1_SRC_DROP, + continued: 0, + length: TOKEN_LENGTHS[c_minor] as base.u32) + break.goto_parsed_a_leaf_value + } args.dst.write_simple_token_fast!( value_major: 0, value_minor: (base.TOKEN__VBC__STRING << 21) | @@ -367,18 +368,19 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor } else if c_major == 3 { // -------- BEGIN Major type 3: a text string. - if c_minor == 0x00 { - args.dst.write_simple_token_fast!( - value_major: 0, - value_minor: (base.TOKEN__VBC__STRING << 21) | - base.TOKEN__VBD__STRING__DEFINITELY_UTF_8 | - base.TOKEN__VBD__STRING__CHAIN_MUST_BE_UTF_8 | - base.TOKEN__VBD__STRING__DEFINITELY_ASCII | - base.TOKEN__VBD__STRING__CONVERT_0_DST_1_SRC_DROP, - continued: 0, - length: 1) - break.goto_parsed_a_leaf_value - } else if c_minor < 0x1C { + if c_minor < 0x1C { + if string_length == 0 { + args.dst.write_simple_token_fast!( + value_major: 0, + value_minor: (base.TOKEN__VBC__STRING << 21) | + base.TOKEN__VBD__STRING__DEFINITELY_UTF_8 | + base.TOKEN__VBD__STRING__CHAIN_MUST_BE_UTF_8 | + base.TOKEN__VBD__STRING__DEFINITELY_ASCII | + base.TOKEN__VBD__STRING__CONVERT_0_DST_1_SRC_DROP, + continued: 0, + length: TOKEN_LENGTHS[c_minor] as base.u32) + break.goto_parsed_a_leaf_value + } args.dst.write_simple_token_fast!( value_major: 0, value_minor: (base.TOKEN__VBC__STRING << 21) |