Fix #11170, accessing empty env var on Windows

(cherry picked from commit 2a86ef1) ref PR #11210 Conflicts: base/env.jl
JuliaLang · May 14, 2015 · b1e665c · b1e665c
1 parent 68969d7
commit b1e665c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/base/env.jl b/base/env.jl
@@ -32,7 +32,7 @@ _hasenv(s::String) = _hasenv(utf16(s))
 function _jl_win_getenv(s::UTF16String,len::Uint32)
     val=zeros(Uint16,len)
     ret=ccall(:GetEnvironmentVariableW,stdcall,Uint32,(Ptr{Uint16},Ptr{Uint16},Uint32),s,val,len)
-    if ret==0 || ret != len-1 || val[end] != 0
+    if (ret==0 && len != 1) || ret != len-1 || val[end] != 0
         error(string("system error getenv: ", s, ' ', len, "-1 != ", ret, ": ", FormatMessage()))
     end
     val