mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-04-20 05:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct UAF bugs caused by doing defer shrink

Browse Source
This commit is contained in:
gingerBill
2025-12-15 09:52:54 +00:00
parent ae314a4c6b
commit 7d46684030
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
core/odin/parser/file_tags.odin
View File

@@ -65,12 +65,6 @@ get_build_arch_from_string :: proc(str: string) -> runtime.Odin_Arch_Type {
@require_results
parse_file_tags :: proc(file: ast.File, allocator := context.allocator) -> (tags: File_Tags) {
context.allocator = allocator
if file.docs == nil && file.tags == nil {
return
}
next_char :: proc(src: string, i: ^int) -> (ch: u8) {
if i^ < len(src) {
ch = src[i^]
@@ -102,15 +96,6 @@ parse_file_tags :: proc(file: ast.File, allocator := context.allocator) -> (tags
}
}
build_kinds: [dynamic]Build_Kind
defer shrink(&build_kinds)
build_project_name_strings: [dynamic]string
defer shrink(&build_project_name_strings)
build_project_names: [dynamic][]string
defer shrink(&build_project_names)
parse_tag :: proc(text: string, tags: ^File_Tags, build_kinds: ^[dynamic]Build_Kind,
build_project_name_strings: ^[dynamic]string,
build_project_names: ^[dynamic][]string) {
@@ -143,7 +128,7 @@ parse_file_tags :: proc(file: ast.File, allocator := context.allocator) -> (tags
for {
skip_whitespace(text, &i)
name_start := i
switch next_char(text, &i) {
case 0, '\r', '\n':
i -= 1
@@ -155,7 +140,7 @@ parse_file_tags :: proc(file: ast.File, allocator := context.allocator) -> (tags
case:
i -= 1
}
scan_value(text, &i)
append(build_project_name_strings, text[name_start:i])
}
@@ -220,6 +205,18 @@ parse_file_tags :: proc(file: ast.File, allocator := context.allocator) -> (tags
}
}
context.allocator = allocator
if file.docs == nil && file.tags == nil {
return
}
build_kinds: [dynamic]Build_Kind
build_project_names: [dynamic][]string
build_project_name_strings: [dynamic]string
if file.docs != nil {
for comment in file.docs.list {
if len(comment.text) < 3 || comment.text[:2] != "//" {
@@ -241,6 +238,10 @@ parse_file_tags :: proc(file: ast.File, allocator := context.allocator) -> (tags
parse_tag(text, &tags, &build_kinds, &build_project_name_strings, &build_project_names)
}
shrink(&build_kinds)
shrink(&build_project_names)
delete(build_project_name_strings)
tags.build = build_kinds[:]
tags.build_project_name = build_project_names[:]