Fix crash when HOME env variable is not set

scala-native · Mar 6, 2020 · c60cba9 · c60cba9 · ekrich · Mar 7, 2020
1 parent 26009f9
commit c60cba9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/javalib/src/main/scala/java/lang/System.scala b/javalib/src/main/scala/java/lang/System.scala
@@ -61,7 +61,8 @@ object System {
         sysProps.setProperty("user.language", userLang)
         sysProps.setProperty("user.country", userCountry)
       }
-      sysProps.setProperty("user.home", getenv("HOME"))
+      val home = getenv("HOME")
+      if (home != null) sysProps.setProperty("user.home", home)
       val buf = stackalloc[scala.Byte](1024)
       unistd.getcwd(buf, 1024) match {
         case null =>

diff --git a/unit-tests/src/test/scala/java/lang/SystemSuite.scala b/unit-tests/src/test/scala/java/lang/SystemSuite.scala
@@ -64,7 +64,7 @@ object SystemSuite extends tests.Suite {
     assert(delta <= tolerance)
   }
 
-  test("Property user.home should be set") {
+  test("Property user.home should be set if env variable is set") {
     assertEquals(System.getProperty("user.home"), System.getenv("HOME"))
   }