protect '--status' against customized 'ps' command; fixes microsoft#40660

weinand · weinand · commit 7a8fa121f0d6 · 2018-01-09T00:06:27.000+01:00
diff --git a/src/vs/base/node/ps.ts b/src/vs/base/node/ps.ts
@@ -233,7 +233,7 @@ export function listProcesses(rootPid: number): Promise<ProcessItem> {
 			});
 		} else {	// OS X & Linux
 
-			const CMD = 'ps -ax -o pid=,ppid=,pcpu=,pmem=,command=';
+			const CMD = '/bin/ps -ax -o pid=,ppid=,pcpu=,pmem=,command=';
 			const PID_CMD = /^\s*([0-9]+)\s+([0-9]+)\s+([0-9]+\.[0-9]+)\s+([0-9]+\.[0-9]+)\s+(.+)$/;
 
 			exec(CMD, { maxBuffer: 1000 * 1024 }, (err, stdout, stderr) => {
diff --git a/src/vs/code/electron-main/diagnostics.ts b/src/vs/code/electron-main/diagnostics.ts
@@ -148,7 +148,9 @@ function formatProcessList(info: IMainProcessInfo, rootProcess: ProcessItem): st
 
 	output.push('CPU %\tMem MB\t   PID\tProcess');
 
-	formatProcessItem(mapPidToWindowTitle, output, rootProcess, 0);
+	if (rootProcess) {
+		formatProcessItem(mapPidToWindowTitle, output, rootProcess, 0);
+	}
 
 	return output.join('\n');
 }

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,9 @@ function formatProcessList(info: IMainProcessInfo, rootProcess: ProcessItem): st`
`148`	`148`
`149`	`149`	`output.push('CPU %\tMem MB\t PID\tProcess');`
`150`	`150`
`151`		`- formatProcessItem(mapPidToWindowTitle, output, rootProcess, 0);`
	`151`	`+ if (rootProcess) {`
	`152`	`+ formatProcessItem(mapPidToWindowTitle, output, rootProcess, 0);`
	`153`	`+ }`
`152`	`154`
`153`	`155`	`return output.join('\n');`
`154`	`156`	`}`