1 files changed, 6 insertions, 3 deletions
diff --git a/winsup/cygwin/cygheap.h b/winsup/cygwin/cygheap.h
index 63585d91a..d2e06bfef 100644
--- a/winsup/cygwin/cygheap.h
+++ b/winsup/cygwin/cygheap.h
@@ -144,15 +144,18 @@ public:
 
   const char *logsrv ()
   {
-    return env_logsrv ("LOGONSERVER=", sizeof ("LOGONSERVER=") - 1);
+    const char *p = env_logsrv ("LOGONSERVER=", sizeof ("LOGONSERVER=") - 1);
+    return (p == almost_null) ? NULL : p;
   }
   const char *winname ()
   {
-    return env_name ("USERNAME=", sizeof ("USERNAME=") - 1);
+    const char *p = env_name ("USERNAME=", sizeof ("USERNAME=") - 1);
+    return (p == almost_null) ? NULL : p;
   }
   const char *domain ()
   {
-    return env_domain ("USERDOMAIN=", sizeof ("USERDOMAIN=") - 1);
+    const char *p = env_domain ("USERDOMAIN=", sizeof ("USERDOMAIN=") - 1);
+    return (p == almost_null) ? NULL : p;
   }
   BOOL set_sid (PSID new_sid);
   BOOL set_orig_sid ();