Merge pull request #1187 from nevkontakte/master

nevkontakte · web-flow · commit df0fbb1be498 · 2023-02-20T15:11:44.000Z
Additional nil checks around NodeJS APIs.
diff --git a/compiler/natives/src/runtime/runtime.go b/compiler/natives/src/runtime/runtime.go
@@ -80,7 +80,7 @@ func init() {
 
 func GOROOT() string {
 	process := js.Global.Get("process")
-	if process == js.Undefined {
+	if process == js.Undefined || process.Get("env") == js.Undefined {
 		return "/"
 	}
 	if v := process.Get("env").Get("GOPHERJS_GOROOT"); v != js.Undefined && v.String() != "" {
diff --git a/compiler/natives/src/syscall/syscall_js_wasm.go b/compiler/natives/src/syscall/syscall_js_wasm.go
@@ -10,6 +10,9 @@ func runtime_envs() []string {
 		return nil
 	}
 	jsEnv := process.Get("env")
+	if jsEnv.IsUndefined() {
+		return nil
+	}
 	envkeys := js.Global().Get("Object").Call("keys", jsEnv)
 	envs := make([]string, envkeys.Length())
 	for i := 0; i < envkeys.Length(); i++ {

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ func init() {`
`80`	`80`
`81`	`81`	`func GOROOT() string {`
`82`	`82`	`process := js.Global.Get("process")`
`83`		`- if process == js.Undefined {`
	`83`	`+ if process == js.Undefined \|\| process.Get("env") == js.Undefined {`
`84`	`84`	`return "/"`
`85`	`85`	`}`
`86`	`86`	`if v := process.Get("env").Get("GOPHERJS_GOROOT"); v != js.Undefined && v.String() != "" {`