Skip to content

Commit 02971af

Browse files
akosyakovroboquat
authored andcommitted
[jb-launcher] no panic on resolving user env vars
1 parent 017cfbf commit 02971af

File tree

1 file changed

+14
-1
lines changed
  • components/ide/jetbrains/launcher

1 file changed

+14
-1
lines changed

components/ide/jetbrains/launcher/main.go

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,8 +494,21 @@ func resolveUserEnvs(launchCtx *LaunchContext) (userEnvs []string, err error) {
494494
return
495495
}
496496
markByte := []byte(mark.String())
497-
start := bytes.Index(output, markByte) + len(markByte)
497+
start := bytes.Index(output, markByte)
498+
if start == -1 {
499+
err = fmt.Errorf("no %s in output", mark.String())
500+
return
501+
}
502+
start = start + len(markByte)
503+
if start > len(output) {
504+
err = fmt.Errorf("no %s in output", mark.String())
505+
return
506+
}
498507
end := bytes.LastIndex(output, markByte)
508+
if end == -1 {
509+
err = fmt.Errorf("no %s in output", mark.String())
510+
return
511+
}
499512
err = json.Unmarshal(output[start:end], &userEnvs)
500513
return
501514
}

0 commit comments

Comments
 (0)