diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-21 19:32:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-21 19:32:53 +0200 |
| commit | 8e5d7aa79c1268b779ccd603f1058638472de8ae (patch) | |
| tree | 04ba691dcb063248baf1bddaf9fd9c4ea87f73a5 /vendor/golang.org/x/sys/unix/syscall_unix.go | |
| parent | 9eb6c3056398c3776018eccd121ac487a9282c36 (diff) | |
| parent | 2ecd15c0d236916d2894c87c73aeeeb08978614f (diff) | |
| download | podman-8e5d7aa79c1268b779ccd603f1058638472de8ae.tar.gz podman-8e5d7aa79c1268b779ccd603f1058638472de8ae.tar.bz2 podman-8e5d7aa79c1268b779ccd603f1058638472de8ae.zip | |
Merge pull request #6316 from containers/dependabot/go_modules/github.com/onsi/ginkgo-1.12.2
Bump github.com/onsi/ginkgo from 1.12.0 to 1.12.2
Diffstat (limited to 'vendor/golang.org/x/sys/unix/syscall_unix.go')
| -rw-r--r-- | vendor/golang.org/x/sys/unix/syscall_unix.go | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/vendor/golang.org/x/sys/unix/syscall_unix.go b/vendor/golang.org/x/sys/unix/syscall_unix.go index 8f710d014..400ba9fbc 100644 --- a/vendor/golang.org/x/sys/unix/syscall_unix.go +++ b/vendor/golang.org/x/sys/unix/syscall_unix.go @@ -12,6 +12,8 @@ import ( "sync" "syscall" "unsafe" + + "golang.org/x/sys/internal/unsafeheader" ) var ( @@ -113,15 +115,12 @@ func (m *mmapper) Mmap(fd int, offset int64, length int, prot int, flags int) (d return nil, errno } - // Slice memory layout - var sl = struct { - addr uintptr - len int - cap int - }{addr, length, length} - - // Use unsafe to turn sl into a []byte. - b := *(*[]byte)(unsafe.Pointer(&sl)) + // Use unsafe to convert addr into a []byte. + var b []byte + hdr := (*unsafeheader.Slice)(unsafe.Pointer(&b)) + hdr.Data = unsafe.Pointer(addr) + hdr.Cap = length + hdr.Len = length // Register mapping in m and return it. p := &b[cap(b)-1] |