Skip to content

Commit 6fa7a7c

Browse files
tklausergopherbot
authored andcommitted
windows: allow calling WSASendto with nil Sockaddr
Same as CL 434535 did for the syscall package. For golang/go#55845 Change-Id: I17f30152ae973b64ac65e08cefd5442e9bf19e2c Reviewed-on: https://go-review.googlesource.com/c/sys/+/435777 TryBot-Result: Gopher Robot <gobot@golang.org> Run-TryBot: Benny Siegert <bsiegert@gmail.com> Auto-Submit: Tobias Klauser <tobias.klauser@gmail.com> Reviewed-by: Benny Siegert <bsiegert@gmail.com> Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com> Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
1 parent c57c793 commit 6fa7a7c

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

windows/syscall_windows.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1115,9 +1115,13 @@ func Shutdown(fd Handle, how int) (err error) {
11151115
}
11161116

11171117
func WSASendto(s Handle, bufs *WSABuf, bufcnt uint32, sent *uint32, flags uint32, to Sockaddr, overlapped *Overlapped, croutine *byte) (err error) {
1118-
rsa, l, err := to.sockaddr()
1119-
if err != nil {
1120-
return err
1118+
var rsa unsafe.Pointer
1119+
var l int32
1120+
if to != nil {
1121+
rsa, l, err = to.sockaddr()
1122+
if err != nil {
1123+
return err
1124+
}
11211125
}
11221126
return WSASendTo(s, bufs, bufcnt, sent, flags, (*RawSockaddrAny)(unsafe.Pointer(rsa)), l, overlapped, croutine)
11231127
}

0 commit comments

Comments
 (0)