ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 23:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3929 from laytan/fix-fmt-len-transfer-to-children

Browse Source 
fmt: fix optional_len or use_nul_termination being used by both array and elems
This commit is contained in:
Jeroen van Rijn
2024-07-15 19:36:20 +02:00
committed by GitHub
parent 3a75a8dd1b f362e0fa20
commit 0a9c150748
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/fmt/fmt.odin
+8
View File
@@ -2751,9 +2751,11 @@ fmt_value :: proc(fi: ^Info, v: any, verb: rune) {
elem := runtime.type_info_base(info.elem) elem := runtime.type_info_base(info.elem)
if elem != nil { if elem != nil {
if n, ok := fi.optional_len.?; ok { if n, ok := fi.optional_len.?; ok {
fi.optional_len = nil
fmt_array(fi, ptr, n, elem.size, elem, verb) fmt_array(fi, ptr, n, elem.size, elem, verb)
return return
} else if fi.use_nul_termination { } else if fi.use_nul_termination {
fi.use_nul_termination = false
fmt_array_nul_terminated(fi, ptr, -1, elem.size, elem, verb) fmt_array_nul_terminated(fi, ptr, -1, elem.size, elem, verb)
return return
} }
@@ -2855,8 +2857,10 @@ fmt_value :: proc(fi: ^Info, v: any, verb: rune) {
n := info.count n := info.count
ptr := v.data ptr := v.data
if ol, ok := fi.optional_len.?; ok { if ol, ok := fi.optional_len.?; ok {
fi.optional_len = nil
n = min(n, ol) n = min(n, ol)
} else if fi.use_nul_termination { } else if fi.use_nul_termination {
fi.use_nul_termination = false
fmt_array_nul_terminated(fi, ptr, n, info.elem_size, info.elem, verb) fmt_array_nul_terminated(fi, ptr, n, info.elem_size, info.elem, verb)
return return
} }
@@ -2867,8 +2871,10 @@ fmt_value :: proc(fi: ^Info, v: any, verb: rune) {
n := slice.len n := slice.len
ptr := slice.data ptr := slice.data
if ol, ok := fi.optional_len.?; ok { if ol, ok := fi.optional_len.?; ok {
fi.optional_len = nil
n = min(n, ol) n = min(n, ol)
} else if fi.use_nul_termination { } else if fi.use_nul_termination {
fi.use_nul_termination = false
fmt_array_nul_terminated(fi, ptr, n, info.elem_size, info.elem, verb) fmt_array_nul_terminated(fi, ptr, n, info.elem_size, info.elem, verb)
return return
} }
@@ -2879,8 +2885,10 @@ fmt_value :: proc(fi: ^Info, v: any, verb: rune) {
n := array.len n := array.len
ptr := array.data ptr := array.data
if ol, ok := fi.optional_len.?; ok { if ol, ok := fi.optional_len.?; ok {
fi.optional_len = nil
n = min(n, ol) n = min(n, ol)
} else if fi.use_nul_termination { } else if fi.use_nul_termination {
fi.use_nul_termination = false
fmt_array_nul_terminated(fi, ptr, n, info.elem_size, info.elem, verb) fmt_array_nul_terminated(fi, ptr, n, info.elem_size, info.elem, verb)
return return
} }
tests/core/fmt/test_core_fmt.odin
+16
View File
@@ -372,6 +372,22 @@ test_odin_value_export :: proc(t: ^testing.T) {
} }
} }
@(test)
leaking_struct_tag :: proc(t: ^testing.T) {
My_Struct :: struct {
names: [^]string `fmt:"v,name_count"`,
name_count: int,
}
name := "hello?"
foo := My_Struct {
names = &name,
name_count = 1,
}
check(t, "My_Struct{names = [\"hello?\"], name_count = 1}", "%v", foo)
}
@(private) @(private)
check :: proc(t: ^testing.T, exp: string, format: string, args: ..any, loc := #caller_location) { check :: proc(t: ^testing.T, exp: string, format: string, args: ..any, loc := #caller_location) {
got := fmt.tprintf(format, ..args) got := fmt.tprintf(format, ..args)