From: Scott Lawrence <bytbox@gmail.com>
Date: Sun, 22 Aug 2010 12:12:56 +0000 (+1000)
Subject: net/ipsock.go: fix error checking bug
X-Git-Tag: weekly.2010-08-25~19
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=d125faeed0ec7383d2524e97d36b759492545df7;p=gostls13.git

net/ipsock.go: fix error checking bug
Check oserr, not err for non-nil (err is never changed)

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/1965042
---

diff --git a/src/pkg/net/ipsock.go b/src/pkg/net/ipsock.go
index 9477420d66..dd796bc920 100644
--- a/src/pkg/net/ipsock.go
+++ b/src/pkg/net/ipsock.go
@@ -68,12 +68,12 @@ func internetSocket(net string, laddr, raddr sockaddr, socktype, proto int, mode
 
 	var la, ra syscall.Sockaddr
 	if laddr != nil {
-		if la, oserr = laddr.sockaddr(family); err != nil {
+		if la, oserr = laddr.sockaddr(family); oserr != nil {
 			goto Error
 		}
 	}
 	if raddr != nil {
-		if ra, oserr = raddr.sockaddr(family); err != nil {
+		if ra, oserr = raddr.sockaddr(family); oserr != nil {
 			goto Error
 		}
 	}