diff options
| author | Bryan C. Mills <bcmills@google.com> | 2020-03-25 22:24:44 -0400 |
|---|---|---|
| committer | Bryan C. Mills <bcmills@google.com> | 2020-03-26 19:02:17 +0000 |
| commit | bfb1342a40216cba0ff5ae3a1b102823b7603068 (patch) | |
| tree | 621954ebed7dbf45e70acd2312c07f8868657a80 /src/cmd/go/internal/test/test.go | |
| parent | 918d4d46cd17192a81a6aced57d09827560ad9f0 (diff) | |
| download | go-bfb1342a40216cba0ff5ae3a1b102823b7603068.tar.gz go-bfb1342a40216cba0ff5ae3a1b102823b7603068.zip | |
cmd/go: do not append to the global cfg.OrigEnv slice
Appending to a global slice is only safe if its length is already
equal to its capacity. That property is not guaranteed for slices in
general, and empirically does not hold for this one.
This is a minimal fix to make it easier to backport.
A more robust cleanup of the base.EnvForDir function will be sent in a
subsequent CL.
Fixes #38077
Updates #37940
Change-Id: I731d5bbd0e516642c2cf43e713eeea15402604e5
Reviewed-on: https://go-review.googlesource.com/c/go/+/225577
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Jay Conrod <jayconrod@google.com>
Reviewed-by: Michael Matloob <matloob@golang.org>
Diffstat (limited to 'src/cmd/go/internal/test/test.go')
| -rw-r--r-- | src/cmd/go/internal/test/test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cmd/go/internal/test/test.go b/src/cmd/go/internal/test/test.go index dbb899219d..ec7bde16fe 100644 --- a/src/cmd/go/internal/test/test.go +++ b/src/cmd/go/internal/test/test.go @@ -1157,7 +1157,7 @@ func (c *runCache) builderRunTest(b *work.Builder, a *work.Action) error { cmd := exec.Command(args[0], args[1:]...) cmd.Dir = a.Package.Dir - cmd.Env = base.EnvForDir(cmd.Dir, cfg.OrigEnv) + cmd.Env = base.EnvForDir(cmd.Dir, cfg.OrigEnv[:len(cfg.OrigEnv):len(cfg.OrigEnv)]) cmd.Stdout = stdout cmd.Stderr = stdout |