Commit 3871c0d

database64128gopherbot

authored and

committed

syscall: permit nil destination address in sendmsgN{Inet4,Inet6}

For #74841 Change-Id: Ic3ef9c61a89bc8bc0594724a6d94eed91fb63eae Reviewed-on: https://go-review.googlesource.com/c/go/+/692435 Reviewed-by: Damien Neil <dneil@google.com> Reviewed-by: Tobias Klauser <tobias.klauser@gmail.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: David Chase <drchase@google.com> Auto-Submit: Tobias Klauser <tobias.klauser@gmail.com>

1 parent a8564bd commit 3871c0dCopy full SHA for 3871c0d

File tree

1 file changed

+14

-6

lines changed

src/syscall
- syscall_unix.go

1 file changed

+14

-6

lines changed

`‎src/syscall/syscall_unix.go‎`

Lines changed: 14 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -410,17 +410,25 @@ func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error)`
`410`	`410`	`}`
`411`	`411`
`412`	`412`	`func sendmsgNInet4(fd int, p, oob []byte, to *SockaddrInet4, flags int) (n int, err error) {`
`413`		`- ptr, salen, err := to.sockaddr()`
`414`		`- if err != nil {`
`415`		`- return 0, err`
	`413`	`+ var ptr unsafe.Pointer`
	`414`	`+ var salen _Socklen`
	`415`	`+ if to != nil {`
	`416`	`+ ptr, salen, err = to.sockaddr()`
	`417`	`+ if err != nil {`
	`418`	`+ return 0, err`
	`419`	`+ }`
`416`	`420`	`}`
`417`	`421`	`return sendmsgN(fd, p, oob, ptr, salen, flags)`
`418`	`422`	`}`
`419`	`423`
`420`	`424`	`func sendmsgNInet6(fd int, p, oob []byte, to *SockaddrInet6, flags int) (n int, err error) {`
`421`		`- ptr, salen, err := to.sockaddr()`
`422`		`- if err != nil {`
`423`		`- return 0, err`
	`425`	`+ var ptr unsafe.Pointer`
	`426`	`+ var salen _Socklen`
	`427`	`+ if to != nil {`
	`428`	`+ ptr, salen, err = to.sockaddr()`
	`429`	`+ if err != nil {`
	`430`	`+ return 0, err`
	`431`	`+ }`
`424`	`432`	`}`
`425`	`433`	`return sendmsgN(fd, p, oob, ptr, salen, flags)`
`426`	`434`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 3871c0d

File tree

1 file changed

1 file changed

`‎src/syscall/syscall_unix.go‎`

0 commit comments