ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-03 14:18:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

encoding/cbor: fix umarshal of big fixed arrays

Browse Source
This commit is contained in:
Laytan Laats
2024-07-08 00:35:19 +02:00
parent 56856b6307
commit 39e9b65c59
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/encoding/cbor/unmarshal.odin
+6 -14
View File
@@ -520,9 +520,7 @@ _unmarshal_array :: proc(d: Decoder, v: any, ti: ^reflect.Type_Info, hdr: Header
return return
case reflect.Type_Info_Array: case reflect.Type_Info_Array:
_, scap := err_conv(_decode_len_container(d, add)) or_return length, _ := err_conv(_decode_len_container(d, add)) or_return
length := min(scap, t.count)
if length > t.count { if length > t.count {
return _unsupported(v, hdr) return _unsupported(v, hdr)
} }
@@ -534,9 +532,7 @@ _unmarshal_array :: proc(d: Decoder, v: any, ti: ^reflect.Type_Info, hdr: Header
return return
case reflect.Type_Info_Enumerated_Array: case reflect.Type_Info_Enumerated_Array:
_, scap := err_conv(_decode_len_container(d, add)) or_return length, _ := err_conv(_decode_len_container(d, add)) or_return
length := min(scap, t.count)
if length > t.count { if length > t.count {
return _unsupported(v, hdr) return _unsupported(v, hdr)
} }
@@ -548,9 +544,7 @@ _unmarshal_array :: proc(d: Decoder, v: any, ti: ^reflect.Type_Info, hdr: Header
return return
case reflect.Type_Info_Complex: case reflect.Type_Info_Complex:
_, scap := err_conv(_decode_len_container(d, add)) or_return length, _ := err_conv(_decode_len_container(d, add)) or_return
length := min(scap, 2)
if length > 2 { if length > 2 {
return _unsupported(v, hdr) return _unsupported(v, hdr)
} }
@@ -570,9 +564,7 @@ _unmarshal_array :: proc(d: Decoder, v: any, ti: ^reflect.Type_Info, hdr: Header
return return
case reflect.Type_Info_Quaternion: case reflect.Type_Info_Quaternion:
_, scap := err_conv(_decode_len_container(d, add)) or_return length, _ := err_conv(_decode_len_container(d, add)) or_return
length := min(scap, 4)
if length > 4 { if length > 4 {
return _unsupported(v, hdr) return _unsupported(v, hdr)
} }
@@ -633,7 +625,7 @@ _unmarshal_map :: proc(d: Decoder, v: any, ti: ^reflect.Type_Info, hdr: Header,
length, _ := err_conv(_decode_len_container(d, add)) or_return length, _ := err_conv(_decode_len_container(d, add)) or_return
unknown := length == -1 unknown := length == -1
fields := reflect.struct_fields_zipped(ti.id) fields := reflect.struct_fields_zipped(ti.id)
for idx := 0; idx < len(fields) && (unknown || idx < length); idx += 1 { for idx := 0; idx < len(fields) && (unknown || idx < length); idx += 1 {
// Decode key, keys can only be strings. // Decode key, keys can only be strings.
key: string key: string
@@ -646,7 +638,7 @@ _unmarshal_map :: proc(d: Decoder, v: any, ti: ^reflect.Type_Info, hdr: Header,
key = keyv key = keyv
} }
defer delete(key, context.temp_allocator) defer delete(key, context.temp_allocator)
// Find matching field. // Find matching field.
use_field_idx := -1 use_field_idx := -1
{ {