Merge pull request #2261 from compnerd/give-the-environment-a-train

compnerd · web-flow · commit 6411b819e8af · 2019-05-14T08:40:41.000-07:00
Process: correct environment block handling on Windows
diff --git a/Foundation/Process.swift b/Foundation/Process.swift
@@ -445,7 +445,10 @@ open class Process: NSObject {
           environment["PWD"] = currentDirectoryURL.path
         }
 
-        let szEnvironment: String = environment.map { $0.key + "=" + $0.value }.joined(separator: "\0")
+        // NOTE(compnerd) the environment string must be terminated by a double
+        // null-terminator.  Otherwise, CreateProcess will fail with
+        // INVALID_PARMETER.
+        let szEnvironment: String = environment.map { $0.key + "=" + $0.value }.joined(separator: "\0") + "\0\0"
 
         let sockets: (first: SOCKET, second: SOCKET) = _socketpair()
 

Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,10 @@ open class Process: NSObject {`
`445`	`445`	`environment["PWD"] = currentDirectoryURL.path`
`446`	`446`	`}`
`447`	`447`
`448`		`- let szEnvironment: String = environment.map { $0.key + "=" + $0.value }.joined(separator: "\0")`
	`448`	`+ // NOTE(compnerd) the environment string must be terminated by a double`
	`449`	`+ // null-terminator. Otherwise, CreateProcess will fail with`
	`450`	`+ // INVALID_PARMETER.`
	`451`	`+ let szEnvironment: String = environment.map { $0.key + "=" + $0.value }.joined(separator: "\0") + "\0\0"`
`449`	`452`
`450`	`453`	`let sockets: (first: SOCKET, second: SOCKET) = _socketpair()`
`451`	`454`