ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-07-12 22:31:25 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix os.get_current_directory() allocator

Browse Source 
This procedure accidentally used the temporary allocator for the
returned string.
Use context.allocator, and the allocator parameter idiom instead.
This commit is contained in:
Tetralux
2020-08-26 08:25:01 +00:00
parent 7309cfdbb2
commit 3820f27c7c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/os/os_windows.odin
+2 -2
View File
@@ -271,7 +271,7 @@ get_page_size :: proc() -> int {
// The current directory is stored as a global variable in the process.
@private cwd_gate := false;
get_current_directory :: proc() -> string {
get_current_directory :: proc(allocator := context.allocator) -> string {
for intrinsics.atomic_xchg(&cwd_gate, true) {}
sz_utf16 := win32.GetCurrentDirectoryW(0, nil);
@@ -282,7 +282,7 @@ get_current_directory :: proc() -> string {
intrinsics.atomic_store(&cwd_gate, false);
return win32.utf16_to_utf8(dir_buf_wstr);
return win32.utf16_to_utf8(dir_buf_wstr, allocator);
}
set_current_directory :: proc(path: string) -> (err: Errno) {