From 77c90c2df532bed65cd77ef85f6a0b6140a214d3 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 31 Mar 2017 17:41:24 -0700 Subject: [PATCH] Fix memory leak in get_environmental_variable() --- toolsrc/src/vcpkg_System.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/toolsrc/src/vcpkg_System.cpp b/toolsrc/src/vcpkg_System.cpp index 589dd1924..688773aea 100644 --- a/toolsrc/src/vcpkg_System.cpp +++ b/toolsrc/src/vcpkg_System.cpp @@ -167,12 +167,13 @@ namespace vcpkg::System if (sz == 0) return nullopt; - auto ret = std::make_unique(sz, L'\0'); - Checks::check_exit(VCPKG_LINE_INFO, MAXDWORD >= ret->size()); - auto sz2 = GetEnvironmentVariableW(varname, ret->data(), static_cast(ret->size())); + std::wstring ret(sz, L'\0'); + + Checks::check_exit(VCPKG_LINE_INFO, MAXDWORD >= ret.size()); + auto sz2 = GetEnvironmentVariableW(varname, ret.data(), static_cast(ret.size())); Checks::check_exit(VCPKG_LINE_INFO, sz2 + 1 == sz); - ret->pop_back(); - return *ret.release(); + ret.pop_back(); + return ret; } static bool is_string_keytype(DWORD hkey_type)