diff options
Diffstat (limited to 'src/pkg/syscall/exec_plan9.go')
| -rw-r--r-- | src/pkg/syscall/exec_plan9.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/pkg/syscall/exec_plan9.go b/src/pkg/syscall/exec_plan9.go index ebd57f3e3..99ad2f158 100644 --- a/src/pkg/syscall/exec_plan9.go +++ b/src/pkg/syscall/exec_plan9.go @@ -183,11 +183,18 @@ func forkAndExecInChild(argv0 *byte, argv []*byte, envv []envItem, dir *byte, at errbuf [ERRMAX]byte ) - // guard against side effects of shuffling fds below. + // Guard against side effects of shuffling fds below. + // Make sure that nextfd is beyond any currently open files so + // that we can't run the risk of overwriting any of them. fd := make([]int, len(attr.Files)) + nextfd = len(attr.Files) for i, ufd := range attr.Files { + if nextfd < int(ufd) { + nextfd = int(ufd) + } fd[i] = int(ufd) } + nextfd++ if envv != nil { clearenv = RFCENVG @@ -251,7 +258,6 @@ func forkAndExecInChild(argv0 *byte, argv []*byte, envv []envItem, dir *byte, at // Pass 1: look for fd[i] < i and move those up above len(fd) // so that pass 2 won't stomp on an fd it needs later. - nextfd = int(len(fd)) if pipe < nextfd { r1, _, _ = RawSyscall(SYS_DUP, uintptr(pipe), uintptr(nextfd), 0) if int32(r1) == -1 { |