when spawning a pty, be sure to provide & escape conhost's path (#4172)

Fixes #4061. Co-authored-by: Michael Niksa <miniksa@microsoft.com>
microsoft · Jan 11, 2020 · 2712e41 · 2712e41
1 parent 3fcc935
commit 2712e41
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/winconpty/winconpty.cpp b/src/winconpty/winconpty.cpp
@@ -82,7 +82,8 @@ HRESULT _CreatePseudoConsole(const HANDLE hToken,
     RETURN_IF_WIN32_BOOL_FALSE(CreatePipe(signalPipeConhostSide.addressof(), signalPipeOurSide.addressof(), &sa, 0));
     RETURN_IF_WIN32_BOOL_FALSE(SetHandleInformation(signalPipeConhostSide.get(), HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT));
 
-    const wchar_t* pwszFormat = L"%s --headless %s--width %hu --height %hu --signal 0x%x --server 0x%x";
+    // GH4061: Ensure that the path to executable in the format is escaped so C:\Program.exe cannot collide with C:\Program Files
+    const wchar_t* pwszFormat = L"\"%s\" --headless %s--width %hu --height %hu --signal 0x%x --server 0x%x";
     // This is plenty of space to hold the formatted string
     wchar_t cmd[MAX_PATH]{};
     const BOOL bInheritCursor = (dwFlags & PSEUDOCONSOLE_INHERIT_CURSOR) == PSEUDOCONSOLE_INHERIT_CURSOR;
@@ -149,7 +150,7 @@ HRESULT _CreatePseudoConsole(const HANDLE hToken,
         if (hToken == INVALID_HANDLE_VALUE || hToken == nullptr)
         {
             // Call create process
-            RETURN_IF_WIN32_BOOL_FALSE(CreateProcessW(nullptr,
+            RETURN_IF_WIN32_BOOL_FALSE(CreateProcessW(_ConsoleHostPath(),
                                                       cmd,
                                                       nullptr,
                                                       nullptr,
@@ -164,7 +165,7 @@ HRESULT _CreatePseudoConsole(const HANDLE hToken,
         {
             // Call create process
             RETURN_IF_WIN32_BOOL_FALSE(CreateProcessAsUserW(hToken,
-                                                            nullptr,
+                                                            _ConsoleHostPath(),
                                                             cmd,
                                                             nullptr,
                                                             nullptr,