diff options
| author | Ian Lance Taylor <iant@golang.org> | 2022-02-11 14:53:56 -0800 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2022-02-11 15:01:19 -0800 |
| commit | 8dc2499aa62f768c6395c9754b8cabc1ce25c494 (patch) | |
| tree | 43d7fd2bbfd7ad8c9625a718a5e8718889351994 /libgo/go/net/ip.go | |
| parent | 9a56779dbc4e2d9c15be8d31e36f2f59be7331a8 (diff) | |
| download | gcc-8dc2499aa62f768c6395c9754b8cabc1ce25c494.zip gcc-8dc2499aa62f768c6395c9754b8cabc1ce25c494.tar.gz gcc-8dc2499aa62f768c6395c9754b8cabc1ce25c494.tar.bz2 | |
libgo: update to Go1.18beta2
gotools/
* Makefile.am (go_cmd_cgo_files): Add ast_go118.go
(check-go-tool): Copy golang.org/x/tools directories.
* Makefile.in: Regenerate.
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/384695
Diffstat (limited to 'libgo/go/net/ip.go')
| -rw-r--r-- | libgo/go/net/ip.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libgo/go/net/ip.go b/libgo/go/net/ip.go index 38e1aa2..54c5288 100644 --- a/libgo/go/net/ip.go +++ b/libgo/go/net/ip.go @@ -308,7 +308,7 @@ func ubtoa(dst []byte, start int, v byte) int { // It returns one of 4 forms: // - "<nil>", if ip has length 0 // - dotted decimal ("192.0.2.1"), if ip is an IPv4 or IP4-mapped IPv6 address -// - IPv6 ("2001:db8::1"), if ip is a valid IPv6 address +// - IPv6 conforming to RFC 5952 ("2001:db8::1"), if ip is a valid IPv6 address // - the hexadecimal form of ip, without punctuation, if no other cases apply func (ip IP) String() string { p := ip @@ -545,6 +545,9 @@ func (n *IPNet) Network() string { return "ip+net" } // character and a mask expressed as hexadecimal form with no // punctuation like "198.51.100.0/c000ff00". func (n *IPNet) String() string { + if n == nil { + return "<nil>" + } nn, m := networkNumberAndMask(n) if nn == nil || m == nil { return "<nil>" |