diff options
| -rw-r--r-- | usr/gri/gosrc/platform.go | 2 | ||||
| -rw-r--r-- | usr/gri/pretty/Makefile | 2 | ||||
| -rw-r--r-- | usr/gri/pretty/platform.go | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/usr/gri/gosrc/platform.go b/usr/gri/gosrc/platform.go index c76d59150..6e96b4ada 100644 --- a/usr/gri/gosrc/platform.go +++ b/usr/gri/gosrc/platform.go @@ -21,7 +21,7 @@ func GetEnv(key string) string { n := len(key); for i := 0; i < sys.envc(); i++ { v := sys.envv(i); - if v[0 : n] == key { + if n < len(v) && v[0 : n] == key && v[n] == '=' { return v[n + 1 : len(v)]; // +1: trim "=" } } diff --git a/usr/gri/pretty/Makefile b/usr/gri/pretty/Makefile index a6e355672..03f3e4f36 100644 --- a/usr/gri/pretty/Makefile +++ b/usr/gri/pretty/Makefile @@ -12,8 +12,6 @@ test: pretty pretty *.go pretty ../gosrc/*.go pretty $(GOROOT)/test/sieve.go - pretty $(GOROOT)/test/bugs/*.go # some files legally don't compile - pretty $(GOROOT)/test/fixedbugs/*.go # some files legally don't compile pretty $(GOROOT)/src/pkg/*.go pretty $(GOROOT)/src/lib/flag.go pretty $(GOROOT)/src/lib/fmt.go diff --git a/usr/gri/pretty/platform.go b/usr/gri/pretty/platform.go index c76d59150..6e96b4ada 100644 --- a/usr/gri/pretty/platform.go +++ b/usr/gri/pretty/platform.go @@ -21,7 +21,7 @@ func GetEnv(key string) string { n := len(key); for i := 0; i < sys.envc(); i++ { v := sys.envv(i); - if v[0 : n] == key { + if n < len(v) && v[0 : n] == key && v[n] == '=' { return v[n + 1 : len(v)]; // +1: trim "=" } } |