From e96c4029b81ba729c41a4e1a014a941b81c21085 Mon Sep 17 00:00:00 2001 From: Edo Date: Mon, 7 Nov 2022 11:13:13 +0000 Subject: [PATCH] utils: remove double allocation for env variable (#552) --- src/Utils/Utils.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Utils/Utils.cpp b/src/Utils/Utils.cpp index 26862e6e..53ed0ce8 100644 --- a/src/Utils/Utils.cpp +++ b/src/Utils/Utils.cpp @@ -106,7 +106,7 @@ namespace Utils void SetLegacyEnvironment() { - wchar_t binaryPath[512]; + wchar_t binaryPath[512]{}; GetModuleFileNameW(GetModuleHandleW(nullptr), binaryPath, sizeof(binaryPath) / sizeof(wchar_t)); auto* exeBaseName = std::wcsrchr(binaryPath, L'\\'); @@ -128,9 +128,8 @@ namespace Utils const auto _0 = gsl::finally([&] { std::free(buffer); }); - const std::wstring dir{buffer, size}; - SetCurrentDirectoryW(dir.data()); - SetDllDirectoryW(dir.data()); + SetCurrentDirectoryW(buffer); + SetDllDirectoryW(buffer); } HMODULE GetNTDLL()