diff options
| author | gingerBill <gingerBill@users.noreply.github.com> | 2025-09-26 15:24:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-26 15:24:11 +0100 |
| commit | 0eaf3ee7cd1b02fd694697fe581c143b0a87c3a3 (patch) | |
| tree | 1624938a1de53ef91c804f0e9acf22b937b9db86 | |
| parent | 1222d40d3916c615781754a7aa37d61d66d0f050 (diff) | |
| parent | b9a09cebee336ad07f26be819abef4b8e9d29e48 (diff) | |
Merge pull request #5678 from alexriedl/wrong-allocator-guard
fix for temp_file name prefix being deallocated before being used
| -rw-r--r-- | core/os/os2/temp_file.odin | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/core/os/os2/temp_file.odin b/core/os/os2/temp_file.odin index ad20b5706..e3e74bd11 100644 --- a/core/os/os2/temp_file.odin +++ b/core/os/os2/temp_file.odin @@ -18,7 +18,7 @@ create_temp_file :: proc(dir, pattern: string) -> (f: ^File, err: Error) { temp_allocator := TEMP_ALLOCATOR_GUARD({}) dir := dir if dir != "" else temp_directory(temp_allocator) or_return prefix, suffix := _prefix_and_suffix(pattern) or_return - prefix = temp_join_path(dir, prefix) or_return + prefix = temp_join_path(dir, prefix, temp_allocator) or_return rand_buf: [10]byte name_buf := make([]byte, len(prefix)+len(rand_buf)+len(suffix), temp_allocator) @@ -50,7 +50,7 @@ make_directory_temp :: proc(dir, pattern: string, allocator: runtime.Allocator) temp_allocator := TEMP_ALLOCATOR_GUARD({ allocator }) dir := dir if dir != "" else temp_directory(temp_allocator) or_return prefix, suffix := _prefix_and_suffix(pattern) or_return - prefix = temp_join_path(dir, prefix) or_return + prefix = temp_join_path(dir, prefix, temp_allocator) or_return rand_buf: [10]byte name_buf := make([]byte, len(prefix)+len(rand_buf)+len(suffix), temp_allocator) @@ -88,12 +88,10 @@ temp_directory :: proc(allocator: runtime.Allocator) -> (string, Error) { @(private="file") -temp_join_path :: proc(dir, name: string) -> (string, runtime.Allocator_Error) { - temp_allocator := TEMP_ALLOCATOR_GUARD({}) - +temp_join_path :: proc(dir, name: string, allocator: runtime.Allocator) -> (string, runtime.Allocator_Error) { if len(dir) > 0 && is_path_separator(dir[len(dir)-1]) { - return concatenate({dir, name}, temp_allocator,) + return concatenate({dir, name}, allocator) } - return concatenate({dir, Path_Separator_String, name}, temp_allocator) + return concatenate({dir, Path_Separator_String, name}, allocator) } |