From dbec4b0d0e4395e22e178a3fea91b6bfdcd52c61 Mon Sep 17 00:00:00 2001 From: Ian Lilley Date: Wed, 3 Aug 2022 11:49:42 -0400 Subject: [PATCH] fixed memory leak from calling get_env --- core/os/os2/user.odin | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/core/os/os2/user.odin b/core/os/os2/user.odin index 1fb653b85..00cccd2a7 100644 --- a/core/os/os2/user.odin +++ b/core/os/os2/user.odin @@ -6,19 +6,19 @@ import "core:runtime" user_cache_dir :: proc(allocator: runtime.Allocator) -> (dir: string, err: Error) { #partial switch ODIN_OS { case .Windows: - dir = get_env("LocalAppData") + dir = get_env("LocalAppData", allocator) if dir != "" { dir = strings.clone_safe(dir, allocator) or_return } case .Darwin: - dir = get_env("HOME") + dir = get_env("HOME", allocator) if dir != "" { dir = strings.concatenate_safe({dir, "/Library/Caches"}, allocator) or_return } case: // All other UNIX systems - dir = get_env("XDG_CACHE_HOME") + dir = get_env("XDG_CACHE_HOME", allocator) if dir == "" { - dir = get_env("HOME") + dir = get_env("HOME", allocator) if dir == "" { return } @@ -34,19 +34,19 @@ user_cache_dir :: proc(allocator: runtime.Allocator) -> (dir: string, err: Error user_config_dir :: proc(allocator: runtime.Allocator) -> (dir: string, err: Error) { #partial switch ODIN_OS { case .Windows: - dir = get_env("AppData") + dir = get_env("AppData", allocator) if dir != "" { dir = strings.clone_safe(dir, allocator) or_return } case .Darwin: - dir = get_env("HOME") + dir = get_env("HOME", allocator) if dir != "" { dir = strings.concatenate_safe({dir, "/Library/Application Support"}, allocator) or_return } case: // All other UNIX systems - dir = get_env("XDG_CACHE_HOME") + dir = get_env("XDG_CACHE_HOME", allocator) if dir == "" { - dir = get_env("HOME") + dir = get_env("HOME", allocator) if dir == "" { return } @@ -59,13 +59,13 @@ user_config_dir :: proc(allocator: runtime.Allocator) -> (dir: string, err: Erro return } -user_home_dir :: proc() -> (dir: string, err: Error) { +user_home_dir :: proc(allocator: runtime.Allocator) -> (dir: string, err: Error) { env := "HOME" #partial switch ODIN_OS { case .Windows: env = "USERPROFILE" } - if v := get_env(env); v != "" { + if v := get_env(env, allocator); v != "" { return v, nil } return "", .Invalid_Path