diff options
| -rw-r--r-- | lib/Support/Windows/Process.inc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/Support/Windows/Process.inc b/lib/Support/Windows/Process.inc index 50a204fe5f..f9a3db9d91 100644 --- a/lib/Support/Windows/Process.inc +++ b/lib/Support/Windows/Process.inc @@ -161,8 +161,9 @@ Optional<std::string> Process::GetEnv(StringRef Name) { SmallVector<wchar_t, MAX_PATH> Buf; size_t Size = MAX_PATH; do { - Buf.resize(Size); - Size = GetEnvironmentVariableW(&NameUTF16[0], &Buf[0], Buf.capacity()); + Buf.reserve(Size); + Size = + GetEnvironmentVariableW(NameUTF16.data(), Buf.data(), Buf.capacity()); if (Size == 0) return None; @@ -172,9 +173,9 @@ Optional<std::string> Process::GetEnv(StringRef Name) { // Convert the result from UTF-16 to UTF-8. SmallVector<char, MAX_PATH> Res; - if (error_code ec = windows::UTF16ToUTF8(&Buf[0], Size, Res)) + if (error_code ec = windows::UTF16ToUTF8(Buf.data(), Size, Res)) return None; - return std::string(&Res[0]); + return std::string(Res.data()); } error_code |