Make sure scripts are properly quoted when sending to the debugger.

Paul van Brenk · Paul van Brenk · commit 3fb4c47c26bb · 2017-02-28T16:57:05.000-08:00
diff --git a/Common/Product/SharedProject/CommonProjectNode.cs b/Common/Product/SharedProject/CommonProjectNode.cs
@@ -1549,7 +1549,7 @@ protected override ConfigProvider CreateConfigProvider() {
         /// Returns resolved value of the current working directory property.
         /// </summary>
         public string GetWorkingDirectory() {
-            string workDir = CommonUtils.UnquotePath(GetProjectProperty(CommonConstants.WorkingDirectory, resetCache: false));
+            var workDir = CommonUtils.UnquotePath(GetProjectProperty(CommonConstants.WorkingDirectory, resetCache: false));
             return CommonUtils.GetAbsoluteDirectoryPath(ProjectHome, workDir);
         }
 
diff --git a/Nodejs/Product/Nodejs/Debugger/NodeDebugger.cs b/Nodejs/Product/Nodejs/Debugger/NodeDebugger.cs
@@ -126,7 +126,7 @@ public static NodeProcess StartNodeProcessWithDebug(
             var debuggerPortOrDefault = debuggerPort ?? GetDebuggerPort();
 
             // Node usage: node [options] [ -e script | script.js ] [arguments]
-            var allArgs = $"--debug-brk={debuggerPortOrDefault} --nolazy {interpreterOptions} \"{script}\"";
+            var allArgs = $"--debug-brk={debuggerPortOrDefault} --nolazy {interpreterOptions} \"{CommonUtils.UnquotePath(script)}\""; /* unquote the path so we can safely add quotes */
 
             return StartNodeProcess(exe, dir, env, debugOptions, debuggerPortOrDefault, allArgs, createNodeWindow);
         }
@@ -144,7 +144,7 @@ public static NodeProcess StartNodeProcessWithInspect(
             var debuggerPortOrDefault = debuggerPort ?? GetDebuggerPort();
 
             // Node usage: node [options] [ -e script | script.js ] [arguments]
-            string allArgs = $"--inspect={debuggerPortOrDefault} --debug-brk --nolazy {interpreterOptions} \"{script}\"";
+            var allArgs = $"--inspect={debuggerPortOrDefault} --debug-brk --nolazy {interpreterOptions} \"{CommonUtils.UnquotePath(script)}\""; /* unquote the path so we can safely add quotes */
 
             return StartNodeProcess(exe, dir, env, debugOptions, debuggerPortOrDefault, allArgs, createNodeWindow);
         }
@@ -169,7 +169,7 @@ private static NodeProcess StartNodeProcess(
                 var envValues = env.Split('\0');
                 foreach (var curValue in envValues) {
                     var nameValue = curValue.Split(new[] { '=' }, 2);
-                    if (nameValue.Length == 2 && !String.IsNullOrWhiteSpace(nameValue[0])) {
+                    if (nameValue.Length == 2 && !string.IsNullOrWhiteSpace(nameValue[0])) {
                         psi.EnvironmentVariables[nameValue[0]] = nameValue[1];
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -1549,7 +1549,7 @@ protected override ConfigProvider CreateConfigProvider() {`
`1549`	`1549`	`/// Returns resolved value of the current working directory property.`
`1550`	`1550`	`/// </summary>`
`1551`	`1551`	`public string GetWorkingDirectory() {`
`1552`		`- string workDir = CommonUtils.UnquotePath(GetProjectProperty(CommonConstants.WorkingDirectory, resetCache: false));`
	`1552`	`+ var workDir = CommonUtils.UnquotePath(GetProjectProperty(CommonConstants.WorkingDirectory, resetCache: false));`
`1553`	`1553`	`return CommonUtils.GetAbsoluteDirectoryPath(ProjectHome, workDir);`
`1554`	`1554`	`}`
`1555`	`1555`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ public static NodeProcess StartNodeProcessWithDebug(`
`126`	`126`	`var debuggerPortOrDefault = debuggerPort ?? GetDebuggerPort();`
`127`	`127`
`128`	`128`	`// Node usage: node [options] [ -e script \| script.js ] [arguments]`
`129`		`- var allArgs = $"--debug-brk={debuggerPortOrDefault} --nolazy {interpreterOptions} \"{script}\"";`
	`129`	`+ var allArgs = $"--debug-brk={debuggerPortOrDefault} --nolazy {interpreterOptions} \"{CommonUtils.UnquotePath(script)}\""; /* unquote the path so we can safely add quotes */`
`130`	`130`
`131`	`131`	`return StartNodeProcess(exe, dir, env, debugOptions, debuggerPortOrDefault, allArgs, createNodeWindow);`
`132`	`132`	`}`
`@@ -144,7 +144,7 @@ public static NodeProcess StartNodeProcessWithInspect(`
`144`	`144`	`var debuggerPortOrDefault = debuggerPort ?? GetDebuggerPort();`
`145`	`145`
`146`	`146`	`// Node usage: node [options] [ -e script \| script.js ] [arguments]`
`147`		`- string allArgs = $"--inspect={debuggerPortOrDefault} --debug-brk --nolazy {interpreterOptions} \"{script}\"";`
	`147`	`+ var allArgs = $"--inspect={debuggerPortOrDefault} --debug-brk --nolazy {interpreterOptions} \"{CommonUtils.UnquotePath(script)}\""; /* unquote the path so we can safely add quotes */`
`148`	`148`
`149`	`149`	`return StartNodeProcess(exe, dir, env, debugOptions, debuggerPortOrDefault, allArgs, createNodeWindow);`
`150`	`150`	`}`
`@@ -169,7 +169,7 @@ private static NodeProcess StartNodeProcess(`
`169`	`169`	`var envValues = env.Split('\0');`
`170`	`170`	`foreach (var curValue in envValues) {`
`171`	`171`	`var nameValue = curValue.Split(new[] { '=' }, 2);`
`172`		`- if (nameValue.Length == 2 && !String.IsNullOrWhiteSpace(nameValue[0])) {`
	`172`	`+ if (nameValue.Length == 2 && !string.IsNullOrWhiteSpace(nameValue[0])) {`
`173`	`173`	`psi.EnvironmentVariables[nameValue[0]] = nameValue[1];`
`174`	`174`	`}`
`175`	`175`	`}`