diff options
Diffstat (limited to 'src/internal/syscall/execenv')
| -rw-r--r-- | src/internal/syscall/execenv/execenv_windows.go | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/src/internal/syscall/execenv/execenv_windows.go b/src/internal/syscall/execenv/execenv_windows.go index a8aa1a644e..46ba12efc5 100644 --- a/src/internal/syscall/execenv/execenv_windows.go +++ b/src/internal/syscall/execenv/execenv_windows.go @@ -25,30 +25,24 @@ func Default(sys *syscall.SysProcAttr) (env []string, err error) { if sys == nil || sys.Token == 0 { return syscall.Environ(), nil } - var block *uint16 - err = windows.CreateEnvironmentBlock(&block, sys.Token, false) + var blockp *uint16 + err = windows.CreateEnvironmentBlock(&blockp, sys.Token, false) if err != nil { return nil, err } - defer windows.DestroyEnvironmentBlock(block) - blockp := uintptr(unsafe.Pointer(block)) - for { + defer windows.DestroyEnvironmentBlock(blockp) + const size = unsafe.Sizeof(*blockp) + for *blockp != 0 { // environment block ends with empty string // find NUL terminator - end := unsafe.Pointer(blockp) + end := unsafe.Add(unsafe.Pointer(blockp), size) for *(*uint16)(end) != 0 { - end = unsafe.Pointer(uintptr(end) + 2) + end = unsafe.Add(end, size) } - n := (uintptr(end) - uintptr(unsafe.Pointer(blockp))) / 2 - if n == 0 { - // environment block ends with empty string - break - } - - entry := (*[(1 << 30) - 1]uint16)(unsafe.Pointer(blockp))[:n:n] + entry := unsafe.Slice(blockp, (uintptr(end)-uintptr(unsafe.Pointer(blockp)))/2) env = append(env, string(utf16.Decode(entry))) - blockp += 2 * (uintptr(len(entry)) + 1) + blockp = (*uint16)(unsafe.Add(end, size)) } return } |