diff options
| author | Corey Thomasson <cthom.lists@gmail.com> | 2011-01-19 09:55:46 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2011-01-19 09:55:46 -0500 |
| commit | 43582bad33f18ea3f88252574810aee849380590 (patch) | |
| tree | 8a99879eccff9814f7a2b4c65826ca9f87e985fb | |
| parent | 4a7cdc794452ce31432b881af99ec994887d07ee (diff) | |
| download | go-43582bad33f18ea3f88252574810aee849380590.tar.gz go-43582bad33f18ea3f88252574810aee849380590.zip | |
net: avoid nil dereference if /etc/services can't be opened
R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/4081041
| -rw-r--r-- | src/pkg/net/port.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/pkg/net/port.go b/src/pkg/net/port.go index cd18d2b42a..7d25058b29 100644 --- a/src/pkg/net/port.go +++ b/src/pkg/net/port.go @@ -18,7 +18,9 @@ var onceReadServices sync.Once func readServices() { services = make(map[string]map[string]int) var file *file - file, servicesError = open("/etc/services") + if file, servicesError = open("/etc/services"); servicesError != nil { + return + } for line, ok := file.readLine(); ok; line, ok = file.readLine() { // "http 80/tcp www www-http # World Wide Web HTTP" if i := byteIndex(line, '#'); i >= 0 { |