Skip to content

fix(tools): prevent environment variable race in script shell tool #2616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dgageot merged 1 commit into from
May 4, 2026
+12 −2
Merged

fix(tools): prevent environment variable race in script shell tool #2616

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions pkg/tools/builtin/script_shell.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,22 @@ func (t *ScriptShellTool) execute(ctx context.Context, toolConfig *latest.Script

cmd := exec.CommandContext(ctx, shell, append(argsPrefix, toolConfig.Cmd)...)
cmd.Dir = toolConfig.WorkingDir
cmd.Env = t.env
// Per-call clone: appending onto t.env would mutate the shared
// backing array under concurrent calls. Expand nil to os.Environ()
// so a nil t.env still inherits the parent env (a non-nil empty
// slice would strip it).
base := t.env
if base == nil {
base = os.Environ()
}
envCopy := make([]string, len(base), len(base)+len(params))
copy(envCopy, base)
for key, value := range params {
if value != nil {
cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%v", key, value))
envCopy = append(envCopy, fmt.Sprintf("%s=%v", key, value))
}
}
cmd.Env = envCopy

output, err := cmd.CombinedOutput()
if err != nil {
Expand Down
Loading