Merge pull request #11 from jbenet/fix/nil-addr

return error if passed nil net.Addr
This commit is contained in:
Juan Benet 2015-10-11 23:44:08 +08:00
commit 4a8bd8f8ba

View File

@ -13,6 +13,10 @@ var errIncorrectNetAddr = fmt.Errorf("incorrect network addr conversion")
// FromNetAddr converts a net.Addr type to a Multiaddr.
func FromNetAddr(a net.Addr) (ma.Multiaddr, error) {
if a == nil {
return nil, fmt.Errorf("nil multiaddr")
}
switch a.Network() {
case "tcp", "tcp4", "tcp6":
ac, ok := a.(*net.TCPAddr)