guard against null python language home

timfel · timfel · commit 563a41456483 · 2019-02-21T11:48:21.000+01:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonCore.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonCore.java
@@ -130,7 +130,7 @@ public static String getSysBasePrefix(TruffleLanguage.Env env) {
         String sysPrefix = env.getOptions().get(PythonOptions.SysBasePrefix);
         if (sysPrefix.isEmpty()) {
             String homePrefix = PythonLanguage.getCurrent().getHome();
-            if (homePrefix.isEmpty()) {
+            if (homePrefix == null || homePrefix.isEmpty()) {
                 homePrefix = PREFIX;
             }
             env.getOptions().set(PythonOptions.SysBasePrefix, homePrefix);

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ public static String getSysBasePrefix(TruffleLanguage.Env env) {`
`130`	`130`	`String sysPrefix = env.getOptions().get(PythonOptions.SysBasePrefix);`
`131`	`131`	`if (sysPrefix.isEmpty()) {`
`132`	`132`	`String homePrefix = PythonLanguage.getCurrent().getHome();`
`133`		`- if (homePrefix.isEmpty()) {`
	`133`	`+ if (homePrefix == null \|\| homePrefix.isEmpty()) {`
`134`	`134`	`homePrefix = PREFIX;`
`135`	`135`	`}`
`136`	`136`	`env.getOptions().set(PythonOptions.SysBasePrefix, homePrefix);`