diff options
| author |  dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> | 2024-02-12 09:56:45 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2024-02-12 09:56:45 +0000 |
| commit | d0e674b3da5e6955f25784c0e9f6003442656aee (patch) | |
| tree | 5d269218c1bd3225343840a911db2a94394b27ca /vendor/golang.org/x/sys/windows/env_windows.go | |
| parent | [chore] Add AI check in PR template (#2625) (diff) | |
| download | gotosocial-d0e674b3da5e6955f25784c0e9f6003442656aee.tar.xz | |
[chore]: Bump golang.org/x/crypto from 0.18.0 to 0.19.0 (#2632)
Diffstat (limited to 'vendor/golang.org/x/sys/windows/env_windows.go')
| -rw-r--r-- | vendor/golang.org/x/sys/windows/env_windows.go | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/vendor/golang.org/x/sys/windows/env_windows.go b/vendor/golang.org/x/sys/windows/env_windows.go index b8ad19250..d4577a423 100644 --- a/vendor/golang.org/x/sys/windows/env_windows.go +++ b/vendor/golang.org/x/sys/windows/env_windows.go @@ -37,14 +37,17 @@ func (token Token) Environ(inheritExisting bool) (env []string, err error) { return nil, err } defer DestroyEnvironmentBlock(block) - blockp := unsafe.Pointer(block) - for { - entry := UTF16PtrToString((*uint16)(blockp)) - if len(entry) == 0 { - break + size := unsafe.Sizeof(*block) + for *block != 0 { + // find NUL terminator + end := unsafe.Pointer(block) + for *(*uint16)(end) != 0 { + end = unsafe.Add(end, size) } - env = append(env, entry) - blockp = unsafe.Add(blockp, 2*(len(entry)+1)) + + entry := unsafe.Slice(block, (uintptr(end)-uintptr(unsafe.Pointer(block)))/size) + env = append(env, UTF16ToString(entry)) + block = (*uint16)(unsafe.Add(end, size)) } return env, nil } |