Commit ec1ee024 authored by Brad Fitzpatrick's avatar Brad Fitzpatrick Committed by Russ Cox

os: remove race paranoia from Environ(); it's guarded now

R=rsc
CC=golang-dev
https://golang.org/cl/4426077
parent 8e340695
...@@ -94,14 +94,10 @@ func Environ() []string { ...@@ -94,14 +94,10 @@ func Environ() []string {
a := make([]string, len(env)) a := make([]string, len(env))
i := 0 i := 0
for k, v := range env { for k, v := range env {
// check i < len(a) for safety, a[i] = k + "=" + v
// in case env is changing underfoot. i++
if i < len(a) {
a[i] = k + "=" + v
i++
}
} }
return a[0:i] return a
} }
// TempDir returns the default directory to use for temporary files. // TempDir returns the default directory to use for temporary files.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment