From dc97023e3100ee651741e7c5b4d8816e0bc3583d Mon Sep 17 00:00:00 2001 From: Peter Atashian Date: Thu, 11 Feb 2016 13:12:56 -0500 Subject: [PATCH] Fix usage of GetUserProfileDirectoryW in env::home_dir Signed-off-by: Peter Atashian --- src/libstd/sys/windows/os.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libstd/sys/windows/os.rs b/src/libstd/sys/windows/os.rs index 48c9b70dce4..688475a7565 100644 --- a/src/libstd/sys/windows/os.rs +++ b/src/libstd/sys/windows/os.rs @@ -338,9 +338,9 @@ pub fn home_dir() -> Option { let _handle = Handle::new(token); super::fill_utf16_buf(|buf, mut sz| { match c::GetUserProfileDirectoryW(token, buf, &mut sz) { - 0 if c::GetLastError() != 0 => 0, + 0 if c::GetLastError() != c::ERROR_INSUFFICIENT_BUFFER => 0, 0 => sz, - n => n as c::DWORD, + _ => sz - 1, // sz includes the null terminator } }, super::os2path).ok() })