From d690ce7dce47f57506d181af1ebb386697dc97c4 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 16 Aug 2020 23:57:21 +1000 Subject: [PATCH] Fix cbor_fuzzer for extended-token CBOR tags Updates https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=24946 --- fuzz/c/std/cbor_fuzzer.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/fuzz/c/std/cbor_fuzzer.c b/fuzz/c/std/cbor_fuzzer.c index a2c5020c..4dd65068 100644 --- a/fuzz/c/std/cbor_fuzzer.c +++ b/fuzz/c/std/cbor_fuzzer.c @@ -84,7 +84,7 @@ uint8_t g_work_buffer_array[1]; typedef uint8_t stack_element; bool // -is_cbor_tag(wuffs_base__token t) { +token_is_cbor_tag(wuffs_base__token t) { return (wuffs_base__token__value_major(&t) == WUFFS_CBOR__TOKEN_VALUE_MAJOR) && (wuffs_base__token__value_minor(&t) & @@ -106,9 +106,12 @@ fuzz_one_token(wuffs_base__token t, } *ti += len; - if ((wuffs_base__token__value_extension(&t) >= 0) && - !wuffs_base__token__continued(&prev_token)) { - return "fuzz: internal error: extended token not after continued token"; + bool is_cbor_tag = token_is_cbor_tag(t); + if (wuffs_base__token__value_extension(&t) >= 0) { + if (!wuffs_base__token__continued(&prev_token)) { + return "fuzz: internal error: extended token not after continued token"; + } + is_cbor_tag = token_is_cbor_tag(prev_token); } int64_t vbc = wuffs_base__token__value_base_category(&t); @@ -210,7 +213,7 @@ fuzz_one_token(wuffs_base__token t, (vbc != WUFFS_BASE__TOKEN__VBC__FILLER) && ((vbc != WUFFS_BASE__TOKEN__VBC__STRUCTURE) || (vbd & WUFFS_BASE__TOKEN__VBD__STRUCTURE__POP)) && - !is_cbor_tag(t)) { + !is_cbor_tag) { stack[*depth] ^= 0x80; }