qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-10-03 07:11:21 -06:00
Code Releases Activity

net: fix crash of Listen with "" or nil laddr

Browse Source 
Fixes #3584.

R=dave, dsymonds, rsc
CC=golang-dev
https://golang.org/cl/6119043
This commit is contained in:
Mikio Hara 2012-04-25 12:29:14 +09:00
parent 0681b13437
commit b252fe7002
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pkg/net/ipsock_posix.go
View File

@ -97,10 +97,13 @@ func favoriteAddrFamily(net string, laddr, raddr sockaddr, mode string) (family
return syscall.AF_INET6, true
}
if mode == "listen" && laddr.isWildcard() {
if mode == "listen" && (laddr == nil || laddr.isWildcard()) {
if supportsIPv4map {
return syscall.AF_INET6, false
}
if laddr == nil {
return syscall.AF_INET, false
}
return laddr.family(), false
}

30
src/pkg/net/unicast_test.go
View File

@ -536,3 +536,33 @@ func TestProhibitionaryDialArgs(t *testing.T) {
}
}
}
func TestWildWildcardListener(t *testing.T) {
switch runtime.GOOS {
case "plan9":
t.Logf("skipping test on %q", runtime.GOOS)
return
}
defer func() {
if recover() != nil {
t.Fatalf("panicked")
}
}()
if ln, err := Listen("tcp", ""); err != nil {
ln.Close()
}
if ln, err := ListenPacket("udp", ""); err != nil {
ln.Close()
}
if ln, err := ListenTCP("tcp", nil); err != nil {
ln.Close()
}
if ln, err := ListenUDP("udp", nil); err != nil {
ln.Close()
}
if ln, err := ListenIP("ip:icmp", nil); err != nil {
ln.Close()
}
}