qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-25 07:07:57 -07:00
Code Releases Activity

net: avoid nil dereference if /etc/services can't be opened

Browse Source 
R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/4081041
This commit is contained in:
Corey Thomasson 2011-01-19 09:55:46 -05:00 committed by Russ Cox
parent 4a7cdc7944
commit 43582bad33
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pkg/net/port.go
View File

@ -18,7 +18,9 @@ var onceReadServices sync.Once
func readServices() { func readServices() {
services = make(map[string]map[string]int) services = make(map[string]map[string]int)
var file *file 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() { for line, ok := file.readLine(); ok; line, ok = file.readLine() {
// "http 80/tcp www www-http # World Wide Web HTTP" // "http 80/tcp www www-http # World Wide Web HTTP"
if i := byteIndex(line, '#'); i >= 0 { if i := byteIndex(line, '#'); i >= 0 {