From: Corey Thomasson <cthom.lists@gmail.com>
Date: Wed, 19 Jan 2011 14:55:46 +0000 (-0500)
Subject: net: avoid nil dereference if /etc/services can't be opened
X-Git-Tag: weekly.2011-01-19~33
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=43582bad33f18ea3f88252574810aee849380590;p=gostls13.git

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

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/4081041
---

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 {