From ff3b3ecb55e95038ddf22b60650795862bc3e7ba Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Tue, 14 Feb 2017 18:28:41 -0800
Subject: Improve impl of get_environmental_variable()

---
 toolsrc/src/vcpkg_System.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'toolsrc/src/vcpkg_System.cpp')

diff --git a/toolsrc/src/vcpkg_System.cpp b/toolsrc/src/vcpkg_System.cpp
index 3b056a675..e1a4c9d51 100644
--- a/toolsrc/src/vcpkg_System.cpp
+++ b/toolsrc/src/vcpkg_System.cpp
@@ -75,7 +75,6 @@ namespace vcpkg::System
 
     optional<std::wstring> get_environmental_variable(const wchar_t* varname) noexcept
     {
-        std::wstring ret;
         wchar_t* buffer;
         _wdupenv_s(&buffer, nullptr, varname);
 
@@ -83,10 +82,8 @@ namespace vcpkg::System
         {
             return nullptr;
         }
-
-        ret = buffer;
-        free(buffer);
-        return std::make_unique<std::wstring>(ret);
+        std::unique_ptr<wchar_t, void(__cdecl *)(void*)> bufptr(buffer, free);
+        return std::make_unique<std::wstring>(buffer);
     }
 
     void set_environmental_variable(const wchar_t* varname, const wchar_t* varvalue) noexcept
-- 
cgit v1.2.3