From 03a87ea3efab89e4819432a880e4eeff02ab71fb Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Tue, 21 Jul 2020 23:29:26 +1000 Subject: [PATCH] Add jsonptr check for to-be-extended token length --- example/jsonptr/jsonptr.cc | 3 +++ std/cbor/decode_cbor.wuffs | 3 +++ 2 files changed, 6 insertions(+) diff --git a/example/jsonptr/jsonptr.cc b/example/jsonptr/jsonptr.cc index fb4e230e..099a3796 100644 --- a/example/jsonptr/jsonptr.cc +++ b/example/jsonptr/jsonptr.cc @@ -1509,6 +1509,9 @@ handle_token(wuffs_base__token t, bool start_of_token_chain) { ? ((uint64_t)(t.value_base_detail__sign_extended())) : vbd; if (t.continued()) { + if (len != 0) { + return "main: internal error: unexpected to-be-extended length"; + } g_token_extension.category = vbc; g_token_extension.detail = x; return nullptr; diff --git a/std/cbor/decode_cbor.wuffs b/std/cbor/decode_cbor.wuffs index 123fb721..bc76df39 100644 --- a/std/cbor/decode_cbor.wuffs +++ b/std/cbor/decode_cbor.wuffs @@ -30,6 +30,9 @@ pub const TOKEN_VALUE_MINOR__DETAIL_MASK : base.u64 = 0x003_FFFF // base.TOKEN__VALUE_EXTENSION__NUM_BITS bits. The 64-bit CBOR tag is either v // or ((v << base.TOKEN__VALUE_EXTENSION__NUM_BITS) | value_extension_1) where // v is (value_minor_0 & TOKEN_VALUE_MINOR__DETAIL_MASK). +// +// When a token chain contains extended tokens like this, all but the last +// token has zero length. pub const TOKEN_VALUE_MINOR__TAG : base.u32 = 0x100_0000 // TOKEN_VALUE_MINOR__MINUS_1_MINUS_X means that the 9-byte length token holds