diff options
| author | Ian Lance Taylor <iant@golang.org> | 2019-09-06 18:12:46 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-09-06 18:12:46 +0000 |
| commit | aa8901e9bb0399d2c16f988ba2fe46eb0c0c5d13 (patch) | |
| tree | 7e63b06d1eec92beec6997c9d3ab47a5d6a835be /libgo/go/syscall/socket.go | |
| parent | 920ea3b8ba3164b61ac9490dfdfceb6936eda6dd (diff) | |
| download | gcc-aa8901e9bb0399d2c16f988ba2fe46eb0c0c5d13.zip gcc-aa8901e9bb0399d2c16f988ba2fe46eb0c0c5d13.tar.gz gcc-aa8901e9bb0399d2c16f988ba2fe46eb0c0c5d13.tar.bz2 | |
libgo: update to Go 1.13beta1 release
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/193497
From-SVN: r275473
Diffstat (limited to 'libgo/go/syscall/socket.go')
| -rw-r--r-- | libgo/go/syscall/socket.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libgo/go/syscall/socket.go b/libgo/go/syscall/socket.go index d3ff636..f42679d 100644 --- a/libgo/go/syscall/socket.go +++ b/libgo/go/syscall/socket.go @@ -310,7 +310,11 @@ func SetsockoptIPv6Mreq(fd, level, opt int, mreq *IPv6Mreq) (err error) { } func SetsockoptString(fd, level, opt int, s string) (err error) { - return setsockopt(fd, level, opt, unsafe.Pointer(&[]byte(s)[0]), Socklen_t(len(s))) + var p unsafe.Pointer + if len(s) > 0 { + p = unsafe.Pointer(&[]byte(s)[0]) + } + return setsockopt(fd, level, opt, p, Socklen_t(len(s))) } //sys recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *Socklen_t) (n int, err error) |