diff options
| author | gingerBill <gingerBill@users.noreply.github.com> | 2025-08-02 11:55:16 +0100 |
|---|---|---|
| committer | gingerBill <gingerBill@users.noreply.github.com> | 2025-08-02 11:55:16 +0100 |
| commit | ae02d3d02d2eb5132fa7c6573ed7db20d7e18f3e (patch) | |
| tree | 0f9f591df4a9862013ff79ef2e5ea3f8c050c393 /core/encoding/cbor | |
| parent | 2561427dd396a69cd49eb02c0814c4e8e8b3a08f (diff) | |
Begin supporting `string16` across the core library
Diffstat (limited to 'core/encoding/cbor')
| -rw-r--r-- | core/encoding/cbor/tags.odin | 2 | ||||
| -rw-r--r-- | core/encoding/cbor/unmarshal.odin | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/core/encoding/cbor/tags.odin b/core/encoding/cbor/tags.odin index 17420af46..e0e69cbf5 100644 --- a/core/encoding/cbor/tags.odin +++ b/core/encoding/cbor/tags.odin @@ -298,7 +298,7 @@ tag_base64_unmarshal :: proc(_: ^Tag_Implementation, d: Decoder, _: Tag_Number, #partial switch t in ti.variant { case reflect.Type_Info_String: - + assert(!t.is_utf16) if t.is_cstring { length := base64.decoded_len(bytes) builder := strings.builder_make(0, length+1) diff --git a/core/encoding/cbor/unmarshal.odin b/core/encoding/cbor/unmarshal.odin index 365ac5d6f..2840429f5 100644 --- a/core/encoding/cbor/unmarshal.odin +++ b/core/encoding/cbor/unmarshal.odin @@ -335,6 +335,8 @@ _unmarshal_value :: proc(d: Decoder, v: any, hdr: Header, allocator := context.a _unmarshal_bytes :: proc(d: Decoder, v: any, ti: ^reflect.Type_Info, hdr: Header, add: Add, allocator := context.allocator, loc := #caller_location) -> (err: Unmarshal_Error) { #partial switch t in ti.variant { case reflect.Type_Info_String: + assert(!t.is_utf16) + bytes := err_conv(_decode_bytes(d, add, allocator=allocator, loc=loc)) or_return if t.is_cstring { |