commit b252fe70026a0e7b4bbf3ec6f4f74cf02e3c73b7
author Mikio Hara <mikioh.mikioh@gmail.com> Wed Apr 25 12:29:14 2012 +0900
committer Mikio Hara <mikioh.mikioh@gmail.com> Wed Apr 25 12:29:14 2012 +0900
tree d40a634bb92bd017b180599f84b5c4aea8f6cd95
parent 0681b13437e36de582521d5b9f1b4664400312a9

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

Fixes #3584.

R=dave, dsymonds, rsc
CC=golang-dev
https://golang.org/cl/6119043

src/pkg/net/ipsock_posix.go

diff --git a/src/pkg/net/ipsock_posix.go b/src/pkg/net/ipsock_posix.go
index ed31319..1718892 100644
--- a/src/pkg/net/ipsock_posix.go
+++ b/src/pkg/net/ipsock_posix.go
@@ -97,10 +97,13 @@
 		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
 	}