net: add nil checks to several String methods to avoid panics
Fixes #945.
R=r
CC=golang-dev
https://golang.org/cl/1848049
diff --git a/src/pkg/net/net.go b/src/pkg/net/net.go
index 0474478..c0c1c3b 100644
--- a/src/pkg/net/net.go
+++ b/src/pkg/net/net.go
@@ -129,6 +129,9 @@
}
func (e *OpError) String() string {
+ if e == nil {
+ return "<nil>"
+ }
s := e.Op
if e.Net != "" {
s += " " + e.Net
@@ -164,6 +167,9 @@
}
func (e *AddrError) String() string {
+ if e == nil {
+ return "<nil>"
+ }
s := e.Error
if e.Addr != "" {
s += " " + e.Addr
