net: fix close of Listener

Fixes #1375. R=rsc, r CC=golang-dev https://golang.org/cl/3731048

net: fix close of Listener
Fixes #1375. R=rsc, r CC=golang-dev https://golang.org/cl/3731048
ed1cbca8 · Michael Hoisie · Russ Cox · bf453eba · ed1cbca8
Commit ed1cbca8 authored Jan 04, 2011 by Michael Hoisie Committed by Russ Cox Jan 04, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

fd.go src/pkg/net/fd.go +4 -0

No files found.
--- a/src/pkg/net/fd.go
+++ b/src/pkg/net/fd.go
@@ -567,6 +567,10 @@ func (fd *netFD) accept(toAddr func(syscall.Sockaddr) Addr) (nfd *netFD, err os.
 	var s, e int
 	var sa syscall.Sockaddr
 	for {
+		if fd.closing {
+			syscall.ForkLock.RUnlock()
+			return nil, os.EINVAL
+		}
 		s, sa, e = syscall.Accept(fd.sysfd)
 		if e != syscall.EAGAIN {
 			break