update go-multiaddr-net with a nil check
works around off nil conn failure: - https://travis-ci.org/ipfs/go-ipfs/jobs/67385491 License: MIT Signed-off-by: Juan Batiz-Benet <juan@benet.ai>
Juan Batiz-Benet committed
Jun 18, 2015 at 18:15 UTC
6bbe575500eaaf53b254822521bde34297193f46
2 files changed
+4
-1
Godeps/Godeps.json
+1
-1
@@ -155,7 +155,7 @@
155
},
156
{
157
"ImportPath": "github.com/jbenet/go-multiaddr-net",
158
- "Rev": "62d4c740c29c00a47ef7f670208022940d245eef"
158
+ "Rev": "b9c1a08db09925939424c826885adfd753a8cd13"
159
},
160
{
161
"ImportPath": "github.com/jbenet/go-multihash",
Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net/net.go
+3
@@ -26,6 +26,9 @@ type Conn interface {
26
// WrapNetConn wraps a net.Conn object with a Multiaddr
27
// friendly Conn.
28
func WrapNetConn(nconn net.Conn) (Conn, error) {
29
+ if nconn == nil {
30
+ return nil, fmt.Errorf("failed to convert nconn.LocalAddr: nil")
31
+ }
32
33
laddr, err := FromNetAddr(nconn.LocalAddr())
34
if err != nil {