Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-11-08 12:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

undo CL 6395055 / 2518eee18c4f

Browse source 
Broke TCP selfConnect

««« original CL description
net: avoid nil pointer dereference when RemoteAddr.String method chain is called

Fixes #3721.

R=dave, rsc
CC=golang-dev
https://golang.org/cl/6395055
»»»

R=rsc
CC=golang-dev
https://golang.org/cl/6533043
This commit is contained in:
Mikio Hara 2012-09-19 01:33:03 +09:00
parent e93891f348
commit e4389c008a
5 changed files with 10 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/pkg/net/file_unix.go
View file

@ -58,13 +58,15 @@ func newFileFD(f *os.File) (*netFD, error) {
}
}
laddr := toAddr(lsa)
rsa, _ := syscall.Getpeername(fd)
raddr := toAddr(rsa)
netfd, err := newFD(fd, family, sotype, laddr.Network())
if err != nil {
closesocket(fd)
return nil, err
}
netfd.setAddr(laddr, remoteSockname(netfd, toAddr))
netfd.setAddr(laddr, raddr)
return netfd, nil
}