logos-messaging/go-multiaddr
1
0
Fork 0
mirror of https://github.com/logos-messaging/go-multiaddr.git synced 2026-01-09 16:33:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

guard against nil {Local,Remote}Addr() return values

Browse Source
This commit is contained in:
Marten Seemann 2021-06-23 10:48:13 -07:00
parent f9c8287afc
commit 1a8d3e4c45
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/net.go
View File

@ -248,16 +248,16 @@ func (l *maListener) Accept() (Conn, error) {
var raddr ma.Multiaddr var raddr ma.Multiaddr
// This block protects us in transports (i.e. unix sockets) that don't have // This block protects us in transports (i.e. unix sockets) that don't have
// remote addresses for inbound connections. // remote addresses for inbound connections.
if nconn.RemoteAddr().String() != "" { if addr := nconn.RemoteAddr(); addr != nil && addr.String() != "" {
raddr, err = FromNetAddr(nconn.RemoteAddr()) raddr, err = FromNetAddr(addr)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to convert conn.RemoteAddr: %s", err) return nil, fmt.Errorf("failed to convert conn.RemoteAddr: %s", err)
} }
} }
var laddr ma.Multiaddr var laddr ma.Multiaddr
if nconn.LocalAddr().String() != "" { if addr := nconn.LocalAddr(); addr != nil && addr.String() != "" {
laddr, err = FromNetAddr(nconn.LocalAddr()) laddr, err = FromNetAddr(addr)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to convert conn.LocalAddr: %s", err) return nil, fmt.Errorf("failed to convert conn.LocalAddr: %s", err)
} }