Escape paths w/single quotes before passing to powershell in sq strin…

…gs (PowerShell#1411) Fix PowerShell#1404
SeeminglyScience · Jul 10, 2018 · 040c216 · 040c216
1 parent 64dde58
commit 040c216
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/process.ts b/src/process.ts
@@ -13,6 +13,9 @@ import Settings = require("./settings");
 import utils = require("./utils");
 
 export class PowerShellProcess {
+    public static escapeSingleQuotes(pspath: string): string {
+        return pspath.replace(new RegExp("'", "g"), "''");
+    }
 
     public onExited: vscode.Event<void>;
     private onExitedEmitter = new vscode.EventEmitter<void>();
@@ -52,8 +55,8 @@ export class PowerShellProcess {
                             : "";
 
                     this.startArgs +=
-                        `-LogPath '${editorServicesLogPath}' ` +
-                        `-SessionDetailsPath '${this.sessionFilePath}' ` +
+                        `-LogPath '${PowerShellProcess.escapeSingleQuotes(editorServicesLogPath)}' ` +
+                        `-SessionDetailsPath '${PowerShellProcess.escapeSingleQuotes(this.sessionFilePath)}' ` +
                         `-FeatureFlags @(${featureFlags})`;
 
                     const powerShellArgs = [
@@ -68,7 +71,7 @@ export class PowerShellProcess {
 
                     powerShellArgs.push(
                         "-Command",
-                        "& '" + startScriptPath + "' " + this.startArgs);
+                        "& '" + PowerShellProcess.escapeSingleQuotes(startScriptPath) + "' " + this.startArgs);
 
                     let powerShellExePath = this.exePath;
 

diff --git a/src/session.ts b/src/session.ts
@@ -173,7 +173,7 @@ export class SessionManager implements Middleware {
                 `-HostProfileId 'Microsoft.VSCode' ` +
                 `-HostVersion '${this.hostVersion}'` +
                 `-AdditionalModules @('PowerShellEditorServices.VSCode') ` +
-                `-BundledModulesPath '${this.bundledModulesPath}'` +
+                `-BundledModulesPath '${PowerShellProcess.escapeSingleQuotes(this.bundledModulesPath)}'` +
                 `-EnableConsoleRepl ` +
                 `-LanguageServicePipeName LanguageService_${id}.pipe ` +
                 `-DebugServicePipeName DebugService_${id}.pipe `;