Fix Pipe Inheritance on Windows #2382
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@swift-ci please test linux |
compnerd
reviewed
Jun 26, 2019
Foundation/FileHandle.swift
Outdated
| @@ -975,9 +975,15 @@ open class Pipe: NSObject { | |||
|
|
|||
| public override init() { | |||
| #if os(Windows) | |||
| var saAttr = SECURITY_ATTRIBUTES() | |||
There was a problem hiding this comment.
You can initialize this inline:
var saAttr: SECURITY_ATTRIBUTES = SECURITY_ATTRIBUTES(nLength: DWORD(MemoryLayout.size(of: saAttr)),
bInheritHandle: true, lpSecurityDescriptor: nil)
| @@ -424,6 +427,7 @@ open class Process: NSObject { | |||
| switch standardError { | |||
| case let pipe as Pipe: | |||
| siStartupInfo.hStdError = pipe.fileHandleForWriting.handle | |||
| SetHandleInformation(pipe.fileHandleForReading.handle, DWORD(HANDLE_FLAG_INHERIT), 0) | |||
There was a problem hiding this comment.
Should we be restoring the attributes on the pipes?
gmittert
force-pushed
the
ItWasMyGrandfathers
branch
from
e3b2e09 to
92f0453
Compare
|
Inlined and restored the pipe inheritance. |
|
@swift-ci please test linux |
- The Security Attributes should allow handle inheritance - The Startup info should indicate the child should use the passed in pipes for stdin/stdout/stderr - The write end of stdin and read end of stdout/stderr shouldn't be inherited by the child - Handles should be made inheritable if they are not
gmittert
force-pushed
the
ItWasMyGrandfathers
branch
from
92f0453 to
42f9f6b
Compare
|
Changed: Files should also be set to be inheritable and reset. |
|
@swift-ci please test linux |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
pipes for stdin/stdout/stderr
inherited by the child